Commit Graph

564296 Commits

Author SHA1 Message Date
Jiashen Wang
d27f188913 Init DownloadableSubscription with Confirmation Code am: 738abf603a am: bff8fecf85
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562762

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I109155dfb8d744804a20ace7cb6a64e5f95faa53
2021-01-28 21:32:31 +00:00
James Lin
108a1933ca Merge "Expose the RCS UCE APIs for capabilities request with presence mechanism." am: 4548fab7d6 am: 795855ec7b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550598

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If010dd634828edb03ecb115c7cdc42f3faade053
2021-01-28 21:06:35 +00:00
Jiashen Wang
bff8fecf85 Init DownloadableSubscription with Confirmation Code am: 738abf603a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562762

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I173c211b77821f0f807287c44ebfdf2aa626f653
2021-01-28 20:58:49 +00:00
James Lin
795855ec7b Merge "Expose the RCS UCE APIs for capabilities request with presence mechanism." am: 4548fab7d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550598

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4c985d452729228d7e9aa69c16d4b49506e967b
2021-01-28 20:45:06 +00:00
James Lin
4548fab7d6 Merge "Expose the RCS UCE APIs for capabilities request with presence mechanism." 2021-01-28 19:35:54 +00:00
Benedict Wong
d9197e9b5b Merge "Implement ConnectingState" am: 026b277911 am: 51bdc6991a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550524

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0413f3171875d53478bd65cb70d8905721fc4c13
2021-01-28 19:02:53 +00:00
Andy Hung
218993465a Merge "audio: add implementation for TV related API" am: f57ff9e7e5 am: 3caa10c625
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562807

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id188bab394314687a0ee320198a09e9e082769eb
2021-01-28 18:33:50 +00:00
Treehugger Robot
62b031351a Merge "Keystore 2.0: Add human readable strings to Keystore exceptions." am: 4844c2065b am: 8fa4c0f37e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546382

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95d001d6b04e826b8d3242e47ed6f1c31cbc7c26
2021-01-28 18:33:15 +00:00
Jeff Sharkey
8121f93bac Merge "Add owners" am: 033aefcb06 am: 8098a5fa5d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562605

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad27ddb7bfdc20663a7ecdfabf0e45a5fef60e02
2021-01-28 18:33:04 +00:00
Benedict Wong
51bdc6991a Merge "Implement ConnectingState" am: 026b277911
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550524

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I807c5f8302fbfc41ab9257d9414b9989c01ab30c
2021-01-28 18:32:55 +00:00
Benedict Wong
026b277911 Merge "Implement ConnectingState" 2021-01-28 18:24:43 +00:00
Andy Hung
3caa10c625 Merge "audio: add implementation for TV related API" am: f57ff9e7e5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562807

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ecaa15c7d3dfbd38be54065d8dc09ba630c33ea
2021-01-28 18:20:34 +00:00
Treehugger Robot
8fa4c0f37e Merge "Keystore 2.0: Add human readable strings to Keystore exceptions." am: 4844c2065b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546382

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0bba4aa616a2951115cb58b4d2ea4a8b4c9464cb
2021-01-28 18:15:36 +00:00
Andy Hung
f57ff9e7e5 Merge "audio: add implementation for TV related API" 2021-01-28 18:03:34 +00:00
Jeff Sharkey
8098a5fa5d Merge "Add owners" am: 033aefcb06
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562605

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia29d71971ddc4b40fdd1fe8d8bccb3c5b9693f37
2021-01-28 18:02:13 +00:00
Treehugger Robot
4844c2065b Merge "Keystore 2.0: Add human readable strings to Keystore exceptions." 2021-01-28 18:01:44 +00:00
Jeff Sharkey
033aefcb06 Merge "Add owners" 2021-01-28 17:22:27 +00:00
Todd Kennedy
19d09ca6ed Add owners
Change-Id: If3e8e500c4a5de47ec76cc19413546b736feb5f9
2021-01-28 17:20:10 +00:00
Anton Hansson
82acf8b6c9 Merge "Switch to new incompatibilities targets" am: b5b629607b am: d258bf95fe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558555

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If764610f4ac9f30a30e6968b7cd9b5e4936a68bd
2021-01-28 17:00:51 +00:00
Anton Hansson
8e84f29c7e Merge "Set installable: false on apex jars by default" am: 42fb4206f8 am: a1e0090236
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559505

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80b9f470b6fd2b81e4782199d318b69f427eb325
2021-01-28 17:00:43 +00:00
Anton Hansson
d258bf95fe Merge "Switch to new incompatibilities targets" am: b5b629607b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558555

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0151a266ce3cafadb415eef476ef59d095d1b52b
2021-01-28 16:52:08 +00:00
Treehugger Robot
bdef0ad3bc Merge "DO NOT MERGE Fix CEC read Global Setting timing" am: 7e69b0a93d am: c0c9dbfc2f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537562

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3fad210d8cfa0ad6619d0216fd3f8af17184495
2021-01-28 16:49:43 +00:00
daren.liao
79f19d0314 DO NOT MERGE Fix CEC read Global Setting timing am: 3bbf6c4bc0 am: 0770cd25c2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537562

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I424d9adecad265dda86e581f2fc86990fb97b2fb
2021-01-28 16:49:40 +00:00
Paul Duffin
387f57737c Merge "Add framework boot image" am: 08ff0a8639 am: 45f1fa008c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556302

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I167c76cc3f965e3feefde79f6af95241864d33d7
2021-01-28 16:48:26 +00:00
Anton Hansson
a1e0090236 Merge "Set installable: false on apex jars by default" am: 42fb4206f8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559505

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b3459ee028cd2e4e5f5fe1f7777418a2dce1888
2021-01-28 16:48:22 +00:00
Anton Hansson
b5b629607b Merge "Switch to new incompatibilities targets" 2021-01-28 16:48:16 +00:00
Anton Hansson
42fb4206f8 Merge "Set installable: false on apex jars by default" 2021-01-28 16:44:40 +00:00
Treehugger Robot
c0c9dbfc2f Merge "DO NOT MERGE Fix CEC read Global Setting timing" am: 7e69b0a93d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537562

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f85bb0e430969ff28604c436c140ec444e49275
2021-01-28 16:22:41 +00:00
daren.liao
0770cd25c2 DO NOT MERGE Fix CEC read Global Setting timing am: 3bbf6c4bc0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537562

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I234893830e878c02ff6d5e6b078525daf85dbff8
2021-01-28 16:12:38 +00:00
Paul Duffin
45f1fa008c Merge "Add framework boot image" am: 08ff0a8639
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556302

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia39190ddae4119a364c62dbe5c1a0becd8d90226
2021-01-28 16:06:35 +00:00
Treehugger Robot
7e69b0a93d Merge "DO NOT MERGE Fix CEC read Global Setting timing" 2021-01-28 15:44:40 +00:00
Paul Duffin
08ff0a8639 Merge "Add framework boot image" 2021-01-28 15:39:57 +00:00
Treehugger Robot
1d90421899 Merge "Remove obsolete OWNERS files" am: b57fa98f59 am: 394138bd68
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0de6038cac1bf5706ea573d58790993e5c75738
2021-01-28 15:31:53 +00:00
Treehugger Robot
394138bd68 Merge "Remove obsolete OWNERS files" am: b57fa98f59
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88b0a43792ff4b1c36950a6f5f35c131c6905d4d
2021-01-28 15:06:36 +00:00
Paul Duffin
1128114af1 Add framework boot image
Currently, it is just a placeholder that retrieves information about
the framework boot image from the dex_bootjars singleton.

Bug: 177892522
Test: m droid
Change-Id: Icd7943a37378a56c416e502aa29d6088c2f247d2
Exempt-From-Owner-Approval: https://crbug.com/gerrit/14008
2021-01-28 14:53:49 +00:00
Treehugger Robot
b57fa98f59 Merge "Remove obsolete OWNERS files" 2021-01-28 14:28:55 +00:00
Treehugger Robot
42cc0967a5 Merge "ECDH SPI interface" am: e43b86d5b1 am: 5e78686425
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542804

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie718a218f85265627c2e8088806bbc950cb2eb9e
2021-01-28 14:15:14 +00:00
Junyu Lai
8062b53a7c Merge "[VCN01] Add NOT_VCN_MANAGED capability" am: ce07556044 am: 6373b3b084
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549897

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia78c1366c0f843bfeadcb16f857a0fc13e2b72cd
2021-01-28 14:15:04 +00:00
Treehugger Robot
5e78686425 Merge "ECDH SPI interface" am: e43b86d5b1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542804

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95b8cb39fd5f57c08c43dbdcae1c0828e93f3666
2021-01-28 13:40:31 +00:00
Junyu Lai
6373b3b084 Merge "[VCN01] Add NOT_VCN_MANAGED capability" am: ce07556044
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549897

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30b0cc54c340150884bebfd289824f1e562eea88
2021-01-28 13:25:50 +00:00
Treehugger Robot
e43b86d5b1 Merge "ECDH SPI interface" 2021-01-28 13:08:42 +00:00
Junyu Lai
ce07556044 Merge "[VCN01] Add NOT_VCN_MANAGED capability" 2021-01-28 13:04:59 +00:00
daren.liao
3bbf6c4bc0 DO NOT MERGE Fix CEC read Global Setting timing
[Description]
When UI enables 2 CEC options right after enable CEC
TV will read the wrong value,
and failed to update value before TV is ready.

We should read the setting again after TV is ready.

Bug: 176708541
Test: Toggle HDMI control settings 10 times PASS

Change-Id: I0e8eaefe3839873c4af476d47bdb1295711d5967
2021-01-28 12:10:16 +00:00
Neil Fuller
ab88c1e30a Remove obsolete OWNERS files
The code has been moved (internally) under bug 175119330. The code that
was here now can be found in
com.android.server.timezonedetector.location instead.

Bug: 175119330
Test: treehugger only
Change-Id: I0446ea16921886ac826f25d624a1c61551d2313e
2021-01-28 12:00:51 +00:00
Oliver Woodman
b5d864ee38 Merge "API to get SOC manufacturer and model" am: a6b77e3294 am: 5fe83ca052
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518117

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I740131a0a906356582e6ab1264ec135bba2a788e
2021-01-28 10:27:01 +00:00
Oliver Woodman
5fe83ca052 Merge "API to get SOC manufacturer and model" am: a6b77e3294
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518117

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib77e15b216e4e4c79b93586d5167bba92026aa29
2021-01-28 10:00:21 +00:00
Oliver Woodman
a6b77e3294 Merge "API to get SOC manufacturer and model" 2021-01-28 09:07:56 +00:00
Treehugger Robot
8172883202 Merge "Note network interfaces based on transport" am: 8334a265ad am: cd65235a77
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562876

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I444343c7230c0f947a666334fb895736fa4bc153
2021-01-28 09:02:21 +00:00
Treehugger Robot
cd65235a77 Merge "Note network interfaces based on transport" am: 8334a265ad
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562876

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae2ae51e3819b37cf2c85ce12715978d6ba68c55
2021-01-28 08:32:23 +00:00
Treehugger Robot
8334a265ad Merge "Note network interfaces based on transport" 2021-01-28 07:45:20 +00:00