Commits · e88117ac6d379b9a193bf48286cc0a62447f8655 · Farzin Kazemzadeh / platform_frameworks_base-old

Feb 18, 2021

Merge "Fix merge conflict." am: am: am: am: · e88117ac

Lorenzo Colitti authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592111

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I857722c7184758b8b42ed0435455e53d03327c16

e88117ac

Merge "Fix merge conflict." am: am: am: · 8680f405

Lorenzo Colitti authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592111

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96aaee4db38274c80ccc7797f66215c038cb5394

8680f405

Merge "Adding a permission to protect exact alarms" into sc-dev am: · 9c3a1056

Suprabh Shukla authored 4 years ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13458535

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I892387ba75826582e766691321523aa6472b9203

9c3a1056

Merge "Add WRITE_SECURE_SETTINGS permission to emergencyinfo" into sc-dev am: · 666f95ff

Fan Zhang authored 4 years ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13606264

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ad2eee1d7af39858c95b85bc0be774398a9bc48

666f95ff

Merge "Fix merge conflict." am: am: · 667d6184

Lorenzo Colitti authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592111

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d070661be72383036f1b16a0c2396840c7e7475

667d6184

Merge "Adding a permission to protect exact alarms" into sc-dev · 48fb8fe9
Suprabh Shukla authored 4 years ago

48fb8fe9
Merge "Add WRITE_SECURE_SETTINGS permission to emergencyinfo" into sc-dev · 0ef3cd67
Fan Zhang authored 4 years ago

0ef3cd67

Merge "Fix merge conflict." am: · ea256c68

Lorenzo Colitti authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592111

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iacfb147645ff01c270ebeefde7ab1b9b61bafd44

ea256c68

Merge "Revert "Add a system TextToSpeech implementation that initiates ...""... · 5256257f

Greg Kaiser authored 4 years ago

Merge "Revert "Add a system TextToSpeech implementation that initiates ..."" into sc-dev am: a2584ca1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13608827

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I085f8e1c468348a53893e9628b7f8bc05c416a03

5256257f

Merge "Revert "Add a system TextToSpeech implementation that initiates ..."" into sc-dev · a2584ca1
Greg Kaiser authored 4 years ago

a2584ca1

Merge "Limit CEC version on version reported by CEC HAL" into sc-dev am: · fe81dad6

Marvin Ramin authored 4 years ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13517972

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide0a33054620c0a51c9485e344624a4797b1296e

fe81dad6

Merge "Fix merge conflict." · 187a9a08
Lorenzo Colitti authored 4 years ago

187a9a08
Merge "Limit CEC version on version reported by CEC HAL" into sc-dev · bfe5028a
Marvin Ramin authored 4 years ago

bfe5028a

Merge "Remove unused method" into sc-dev am: · 918ade45

TreeHugger Robot authored 4 years ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13593505

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d1b73c89f2c2ebab13a4871dd3a93a00aea8536

918ade45

Merge "Fix a bug in last access time computation." into sc-dev am: · f051591a

TreeHugger Robot authored 4 years ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13577794

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3b0286d678e6d2c593d3aa676a7d88b234fdc33

f051591a

Merge changes I0cadd145,I3be3cac4,I9ea6e9e8 am: am: am:... · 2e8b63af

Cody Kesting authored 4 years ago

Merge changes I0cadd145,I3be3cac4,I9ea6e9e8 am: 4ea84f0b am: 3283a267 am: 488a3356 am: 266fa7fb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1590414

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib660cfce4e65693bd70166144c884d3f5bcba57b

2e8b63af

Merge "Add VcnUnderlyingNetworkSpecifier" am: am: am:... · 8379b5ca

Benedict Wong authored 4 years ago

Merge "Add VcnUnderlyingNetworkSpecifier" am: a7d23702 am: f08e1215 am: 2d3fad77 am: 17f7fa76

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1577283

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d9a48b1674820c5fc5f7e1cb424b308a94bb4bc

8379b5ca

Merge "Remove unused method" into sc-dev · c1d7c4d6
TreeHugger Robot authored 4 years ago

c1d7c4d6
Merge "Fix a bug in last access time computation." into sc-dev · 6096c421
TreeHugger Robot authored 4 years ago

6096c421

Merge changes I0cadd145,I3be3cac4,I9ea6e9e8 am: am: am: · 266fa7fb

Cody Kesting authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1590414

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd8fde8dddda9170acd9f5172b9ce3a6a4ba9727

266fa7fb

Merge "Add VcnUnderlyingNetworkSpecifier" am: am: am: · 17f7fa76

Benedict Wong authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1577283

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7535e67907c28c7b394492407c25f8afd06dbd58

17f7fa76

Merge changes I0cadd145,I3be3cac4,I9ea6e9e8 am: am: · 488a3356

Cody Kesting authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1590414

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3bd6b3cb2d243047e9ac56619b95c7480201386c

488a3356

Merge changes I0cadd145,I3be3cac4,I9ea6e9e8 am: · 3283a267

Cody Kesting authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1590414

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3f0b51482a8f71152380d2ecc747c9e66717e2c

3283a267

Merge "Add VcnUnderlyingNetworkSpecifier" am: am: · 2d3fad77

Benedict Wong authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1577283

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2fb83cec26f9c3ec980f358cae6e6a991c2c9545

2d3fad77

Merge changes I0cadd145,I3be3cac4,I9ea6e9e8 · 4ea84f0b

Cody Kesting authored 4 years ago

* changes:
  Correct comment for safe mode alarm in VcnGatewayConnection.
  Implement VCN error callback use.
  Define VcnStatusCallback#onGatewayConnectionError callback.

4ea84f0b

Merge "Add VcnUnderlyingNetworkSpecifier" am: · f08e1215

Benedict Wong authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1577283

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I990d82653ff47a5c99636655478765f20118ca08

f08e1215

Merge "Tighten bubble chain when dragging collapsed stack" into sc-dev am: · a8b08353

Lyn Han authored 4 years ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13606035

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8fe270f83f43c6781744236f3a35099df894d86a

a8b08353

Merge "Tighten bubble chain when dragging collapsed stack" into sc-dev · b8737dac
Lyn Han authored 4 years ago

b8737dac
Merge "Add VcnUnderlyingNetworkSpecifier" · a7d23702
Benedict Wong authored 4 years ago

a7d23702

Merge "media OWNERS: add MediaDrm team" am: am: am: am: · 78dd25cd

Treehugger Robot authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1591195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8da9254922502c9856eb36aaf5094962043dfbd

78dd25cd

[automerger skipped] Merge "Add the immutable flag to EuiccManager calls in... · 9df7c2bb

Jiashen Wang authored 4 years ago

[automerger skipped] Merge "Add the immutable flag to EuiccManager calls in RecoverySystem" am: 822856bc am: 24162e16 am: 61487dfa -s ours am: 23e0638b -s ours

am skip reason: Change-Id Ibce939eec341cb9f572d13a33762cc5bc6e2ef42 with SHA-1 a24192a7 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562338

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a1babf7eb4ae2c326c3037edc2d5513f47d56e1

9df7c2bb

[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base"... · b6fe3310

Bob Badour authored 4 years ago

[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" into rvc-qpr-dev-plus-aosp am: a32301cf -s ours am: e7774e72 -s ours

am skip reason: Change-Id Ic44d662936d1ff0cae7fbe915932b37aa4e4869a with SHA-1 784edef8 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13605510

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2acea9ca136efa5ec75ce64d2042626efc60213

b6fe3310

Merge "media OWNERS: add MediaDrm team" am: am: am: · de209e3a

Treehugger Robot authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1591195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3e4f08b3c4f10d2d118e02f80f3a42d489552ed

de209e3a

[automerger skipped] Merge "Add the immutable flag to EuiccManager calls in... · 23e0638b

Jiashen Wang authored 4 years ago

[automerger skipped] Merge "Add the immutable flag to EuiccManager calls in RecoverySystem" am: 822856bc am: 24162e16 am: 61487dfa -s ours

am skip reason: Change-Id Ibce939eec341cb9f572d13a33762cc5bc6e2ef42 with SHA-1 a24192a7 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562338

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I26ecfc84f987c2a913180125c36022836d1b8e26

23e0638b

[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base"... · e7774e72

Bob Badour authored 4 years ago

[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" into rvc-qpr-dev-plus-aosp am: a32301cf -s ours

am skip reason: Change-Id Ic44d662936d1ff0cae7fbe915932b37aa4e4869a with SHA-1 784edef8 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13605510

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I968524bdea890dec19e36c33d615dd45be4db2c5

e7774e72

Merge "media OWNERS: add MediaDrm team" am: am: · dce6d93e

Treehugger Robot authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1591195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c2d91313e3c8cb02faad0061e41c9d2379a76d2

dce6d93e

Merge "Add the immutable flag to EuiccManager calls in RecoverySystem" am:... · 61487dfa

Jiashen Wang authored 4 years ago

Merge "Add the immutable flag to EuiccManager calls in RecoverySystem" am: 822856bc am: 24162e16

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562338

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia24b0b2e7a1155670aa7b0e0fbe4c805f2f77eae

61487dfa

[automerger skipped] Merge changes from topic... · 3ae2d14f

Bob Badour authored 4 years ago

[automerger skipped] Merge changes from topic "presubmit-am-289267195037481da3696382edaa3c15" into sc-dev am: cd4ec6ac -s ours

am skip reason: Change-Id Ic44d662936d1ff0cae7fbe915932b37aa4e4869a with SHA-1 051ef786 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13605510

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09f4680a213bd2e7124ea8ed6c73c92d4150e6e2

3ae2d14f

Merge changes from topic "presubmit-am-289267195037481da3696382edaa3c15" into sc-dev · cd4ec6ac

Bob Badour authored 4 years ago

* changes:
  [automerged blank] [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base 2p: 784edef8
  [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

cd4ec6ac

Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" into rvc-qpr-dev-plus-aosp · a32301cf
Bob Badour authored 4 years ago

a32301cf