Commits · 9df7c2bb360425329b1833520672a35c445aeca7 · Farzin Kazemzadeh / platform_frameworks_base-old

Feb 18, 2021

[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

[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 "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

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

Jiashen Wang authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec7ac9ff98c8ad75998bfa079da3f2b2ecd47fa5

24162e16

Merge "Split parcelable .aidl files to aidl-export" into sc-dev am: · a63dd37e

Remi NGUYEN VAN authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3685ff998442c000c4b2db9fa54938e481093abe

a63dd37e

Merge "Split parcelable .aidl files to aidl-export" into sc-dev · c048b1c7
Remi NGUYEN VAN authored 4 years ago

c048b1c7
Merge "Add the immutable flag to EuiccManager calls in RecoverySystem" · 822856bc
Jiashen Wang authored 4 years ago

822856bc

[automerger skipped] Merge "Add KeyChain Test API for the credential manager"... · 6631e940

Rubin Xu authored 4 years ago

[automerger skipped] Merge "Add KeyChain Test API for the credential manager" am: 5eeae4c7 am: 5bddee5d am: 7e3ab781 -s ours am: a0656967 -s ours

am skip reason: Change-Id I8487ebc13758a31639d55c8e380faa51d1cfd843 with SHA-1 ad53ef61 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc97b33c26601d126c741a5022a0638b9764f0ab

6631e940

[automerger skipped] Merge "Add KeyChain Test API for the credential manager"... · a0656967

Rubin Xu authored 4 years ago

[automerger skipped] Merge "Add KeyChain Test API for the credential manager" am: 5eeae4c7 am: 5bddee5d am: 7e3ab781 -s ours

am skip reason: Change-Id I8487ebc13758a31639d55c8e380faa51d1cfd843 with SHA-1 ad53ef61 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4296856168c4a7261fd12a172e0336010688499e

a0656967

Merge changes I474cd019,I8d87c1da,I90ebad48 into sc-dev am: · 0ed2cdb1

TreeHugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53791fa59a2418d4ba2c9186098c41c56cb635d1

0ed2cdb1

Merge "More CDM logging" into sc-dev am: · e447398e

Eugene Susla authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6955215f7875e0d8af16d344e8c69dd63327f8f3

e447398e

Merge "Camera: add default secure image size key" into sc-dev am: · 9ac76172

Yin-Chia Yeh authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99a2971506e29856646c5564f2e472224c1f8dbd

9ac76172

Merge "Stop dispatching TaskInfo change when focus changes" into sc-dev am: · a711d947

Garfield Tan authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I740df5bd04be0a2900e2d3d62cd38c9eac821458

a711d947

Merge changes I474cd019,I8d87c1da,I90ebad48 into sc-dev · 2cc5ce22

TreeHugger Robot authored 4 years ago

* changes:
  Make CpuPowerCalculator's Estimators available to com.android.internal
  Implement EnergyConsumer type to ids map for targeted querying
  Add cpu proc file read throttling enabling/disabling

2cc5ce22

Merge "Add WRITE_SECURE_SETTINGS permission to emergencyinfo" · f0603a12
Fan Zhang authored 4 years ago

f0603a12
Merge "More CDM logging" into sc-dev · e982bd25
Eugene Susla authored 4 years ago

e982bd25
Merge "Camera: add default secure image size key" into sc-dev · 73ef4bcc
Yin-Chia Yeh authored 4 years ago

73ef4bcc
Merge "Stop dispatching TaskInfo change when focus changes" into sc-dev · 2faabc9b
Garfield Tan authored 4 years ago

2faabc9b

Merge "Add listener for conversation changes" into sc-dev am: · 524428d0

TreeHugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I793bdb27d3b2f09dac7d53bea8e5c9bc4308707f

524428d0

Merge "Implementation of "Enable 2G" for Settings." into sc-dev am: · 0bb7281b

Yomna Nasser authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03d5d5cc3ccbb78aec031e866b4976f1348439b1

0bb7281b

Merge "Improve docs for uploadCallComposerPicture" into sc-dev am: · 52b8c480

Hall Liu authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ed8ef58551886b5e991a3a294a8d7871e207e63

52b8c480

[automerger skipped] Merge "Add APIs for updating, query 5G slicing status"... · 5cf91942

Shuo Qian authored 4 years ago

[automerger skipped] Merge "Add APIs for updating, query 5G slicing status" into sc-dev am: db9ef8e7 -s ours

am skip reason: Change-Id I6f823be6737f7c7b3dc918230cbb927fac97c6eb with SHA-1 1f4ea44b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ac2ef624eb3363368fedb13389747099f0ae97f

5cf91942