Commit Graph

565973 Commits

Author SHA1 Message Date
James Mattis
d77e30fade Merge "Unit test automation for Multi-Default Tracking" am: 8b3ccda6bb am: 142f7c3e80
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579207

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a26e63926019c37b639f59d5cd7ad901902e2b7
2021-02-24 16:54:32 +00:00
James Mattis
142f7c3e80 Merge "Unit test automation for Multi-Default Tracking" am: 8b3ccda6bb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579207

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I610c8356f00cbd983bcb155139db06d2e16d0748
2021-02-24 15:57:46 +00:00
James Mattis
8b3ccda6bb Merge "Unit test automation for Multi-Default Tracking" 2021-02-24 14:57:24 +00:00
Treehugger Robot
d662cc8a0f Merge "Move CtsScopedStorageHostTest to group presubmit-large" am: 33b19a2507 am: 4e5452499e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598156

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia277d4ad23688b7d421044d7c4fb7446f44fcc5c
2021-02-24 10:27:04 +00:00
Treehugger Robot
4e5452499e Merge "Move CtsScopedStorageHostTest to group presubmit-large" am: 33b19a2507
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598156

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9370bb9a7a28556bf0d92b5cf8bde699e3ad11d5
2021-02-24 09:46:43 +00:00
Treehugger Robot
33b19a2507 Merge "Move CtsScopedStorageHostTest to group presubmit-large" 2021-02-24 08:59:20 +00:00
TreeHugger Robot
e40cc0a9d2 Merge "Fix possible NPE when matching accessory version" into rvc-qpr-dev am: 01f8961bce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13671451

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5379f67519077a60ac692babb18ba74a6ab23cb6
2021-02-24 08:15:20 +00:00
TreeHugger Robot
01f8961bce Merge "Fix possible NPE when matching accessory version" into rvc-qpr-dev 2021-02-24 07:35:31 +00:00
TreeHugger Robot
538165c1d7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8fa81e8f52 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b328562aac3f773466cad0eaf592a47447e3c97
2021-02-24 07:14:45 +00:00
TreeHugger Robot
8fa81e8f52 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-24 06:20:09 +00:00
Treehugger Robot
1c12237ee3 Merge "Revert "Do not propogate test api access flags to Zygote."" am: 6faddabeb7 am: 1856a9efdd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598954

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35de41959fed409a49d101ea9ef3da5c4ced84b6
2021-02-24 04:07:23 +00:00
James Mattis
0b82004d34 Unit test automation for Multi-Default Tracking
Unit test automation validating how multiple default networks are
tracked within ConnectivityService when set by network preferences
used with setOemNetworkPreference() API functionality.

Bug: 178632672
Bug: 172347841
Bug: 170068946
Test: atest FrameworksNetTests
Change-Id: Iae1935944214efaa8a21636c55e6d8be816275f7
2021-02-23 19:03:34 -08:00
Treehugger Robot
1856a9efdd Merge "Revert "Do not propogate test api access flags to Zygote."" am: 6faddabeb7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598954

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd5c0eea7f0e595dc3f65ccfb20e7f6797280c0d
2021-02-24 03:00:41 +00:00
Treehugger Robot
6faddabeb7 Merge "Revert "Do not propogate test api access flags to Zygote."" 2021-02-24 02:20:37 +00:00
Treehugger Robot
155808b3e2 Merge "Defer UID data removal until after reading is finished" am: ce2d40870e am: 7fddb382f7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554529

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0a26de931a690d5248d4449fa048a2abf2e7d71
2021-02-24 02:07:31 +00:00
Cody Kesting
2beb965c06 Merge changes I34ef76ec,Icf686c3d am: 7f60b13ff5 am: 7d8db6692d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia85c2c51f678fc72afb4ca7ad457c56f36425ca9
2021-02-24 02:07:12 +00:00
Treehugger Robot
7fddb382f7 Merge "Defer UID data removal until after reading is finished" am: ce2d40870e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554529

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96787bdcf17949de0df847c92ffe49b790225e74
2021-02-24 01:49:38 +00:00
Cody Kesting
7d8db6692d Merge changes I34ef76ec,Icf686c3d am: 7f60b13ff5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia635aa47cc08fce5859df57908e6215ccf3b10f9
2021-02-24 01:45:53 +00:00
Roshan Pius
7394e95f36 Merge "Add getTargetSdkVersion without AppInfo" am: f8ab9c895b am: 1d024a0e6a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1599639

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5d59fda78badffd826160743adbcfa990052537
2021-02-24 01:43:56 +00:00
Roshan Pius
1d024a0e6a Merge "Add getTargetSdkVersion without AppInfo" am: f8ab9c895b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1599639

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab7f841edba1f96b5b8248bdee88d9165f4d644e
2021-02-24 01:30:53 +00:00
Marcus Hagerott
c0b2128dd2 Merge "Add more detail to javadocs for SimPhonebookContract" am: 57a0af04c5 am: dc54e7afdf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596935

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37d21d22c504e16787e1bcc962fd233ff14a60a9
2021-02-24 01:26:15 +00:00
Andrei-Valentin Onea
88e092a602 Merge "Create non updatable system server stubs" am: 359eca32b3 am: a03cf88ecd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1c5f0f58b91016be9a4f7b75ff03ad218b623d3
2021-02-24 01:25:37 +00:00
Paul Duffin
be50859a86 Merge "Add explicit dependency from android.test.base to hiddenapi annotations" am: d9373ecdaf am: 808984145e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587217

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6c54fc7ef4c18bbf73dfdd549934fcf72edbc8c
2021-02-24 01:24:21 +00:00
Chiachang Wang
58becf95ef Merge "Remove UidRange.createForUser() with userId integers" am: 9c92c37f56 am: 5809c1f054
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596511

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53fdc5ad0cb8f6859c025a11b08ea7f77fb45442
2021-02-24 01:24:02 +00:00
More Kuo
51beeda872 Merge "Update BluetoothA2dp API" am: ae6583b34f am: e90bacbc0a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596413

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied9742a6d57932986ed4579b7760250f156cf415
2021-02-24 01:23:48 +00:00
Kevin Han
2c842f3aa7 Merge "Register AppHibernationManager in service registry" am: 44183743e0 am: 0de60cd4e8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572766

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied0817ca6d49f0861bdb929a6fca78a1d75cb729
2021-02-24 01:23:36 +00:00
Paul Hu
85468ed557 Merge "Use PermissionUtils" am: 584e907d7a am: 93798f22e8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559098

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I483e0db6e9aac5d8ca8d4aa6912fa6f66b198e87
2021-02-24 01:23:09 +00:00
Marcus Hagerott
dc54e7afdf Merge "Add more detail to javadocs for SimPhonebookContract" am: 57a0af04c5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596935

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id968da9f8ec6ada50d674def708662383bf6b382
2021-02-24 01:22:51 +00:00
Andrei-Valentin Onea
a03cf88ecd Merge "Create non updatable system server stubs" am: 359eca32b3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77fc78044c1f04b55612247509a426a652c38be9
2021-02-24 01:07:47 +00:00
Paul Duffin
808984145e Merge "Add explicit dependency from android.test.base to hiddenapi annotations" am: d9373ecdaf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587217

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6190f76d0c49b3e276d685fce401827539699b68
2021-02-24 00:48:45 +00:00
Chiachang Wang
5809c1f054 Merge "Remove UidRange.createForUser() with userId integers" am: 9c92c37f56
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596511

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I736f502788487fd8c0d3f6037866c17945831d62
2021-02-24 00:46:03 +00:00
Kevin Han
8c14a6863e Merge "Check user states exist before package add/removal" am: 486816e35f am: aee5302128
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8edda516d5bb60c11d332b741046c91f5a6a2797
2021-02-24 00:40:16 +00:00
Kevin Han
ac520aad0d Merge "Support dynamic feature flag config" am: 201737c781 am: b9f0ad138b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587774

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I183892c7df058dc6f73c08afda263a0a840293bb
2021-02-24 00:40:12 +00:00
More Kuo
e90bacbc0a Merge "Update BluetoothA2dp API" am: ae6583b34f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596413

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1fc9c4dad0013ecd62788417054f872f29dc775f
2021-02-24 00:39:44 +00:00
Chiachang Wang
4529181d4f Merge "Move shared methods to net shared lib" am: 14da611403 am: f3e5492c46
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09beedc0e71685bba4fa6dc5cc80907ec923b684
2021-02-24 00:39:42 +00:00
Calin Juravle
8900f912e5 Merge "Always use the latest CLC for system server" am: c627177587 am: 6c7dcfeccc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584564

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie1590ceef18959ac7cf6da6351072323aec696e6
2021-02-24 00:39:15 +00:00
Kevin Han
0de60cd4e8 Merge "Register AppHibernationManager in service registry" am: 44183743e0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572766

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf8ac130fe7800af2d83b16f2ae90a7df5558c62
2021-02-24 00:32:44 +00:00
Paul Hu
93798f22e8 Merge "Use PermissionUtils" am: 584e907d7a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559098

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81a3b8d23d1d708675206b36367326c44113c46d
2021-02-24 00:29:54 +00:00
Kevin Han
aee5302128 Merge "Check user states exist before package add/removal" am: 486816e35f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa4d3d86b603a2fe7b05d0d3e9de72c01b14eb34
2021-02-24 00:27:09 +00:00
Kevin Han
b9f0ad138b Merge "Support dynamic feature flag config" am: 201737c781
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587774

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id45fa63b0059bbbc9206cdd8e7e3c8e699b5c9b7
2021-02-24 00:24:12 +00:00
Chiachang Wang
f3e5492c46 Merge "Move shared methods to net shared lib" am: 14da611403
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3baac3770814ea1aba213e54430c44308b0c07bc
2021-02-24 00:16:42 +00:00
Michael Wright
863092a877 Merge "Consolidate OWNERS for input" am: 471c70287e am: 916d84985b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1600293

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7ec688ae8ec0ce72fee8bfae130d951f95400d1
2021-02-24 00:15:17 +00:00
Josh Gao
652967de68 Merge "NativeTombstoneManager: fix tombstone parsing." am: 35a5c1501f am: 76528d5388
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597312

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5262153df4454d1ee3cf00106f3d26bd36309bd4
2021-02-24 00:15:05 +00:00
Treehugger Robot
2087d30844 Merge "Keystore 2.0: Fix correct handling of Uid/Namespace" am: 75025c5b62 am: ace6cea9b0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1599649

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I230b8b1cf1c14cc07c0617ba51e713a403ba3566
2021-02-24 00:14:56 +00:00
Treehugger Robot
a35e9a077a Merge "Release virtual display before stopping projection" am: 2bd3073819 am: 042c3a3311
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585286

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f7dd7113c76aa098c774b7ba831281ccde89652
2021-02-24 00:14:44 +00:00
Jeff Sharkey
77af692204 Merge "Add michaelwr@ to Shell OWNERS" am: c31e4a1e00 am: 7958f98486
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587219

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09e49f27ad2d432d7fa7a494d954ce4a2123cd41
2021-02-24 00:14:27 +00:00
Treehugger Robot
94a089b673 Merge "BugreportManager API review updates." am: e0db8b998f am: c8e42d59e7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibba20423d6d2d3a5394d871f5f4f2d33d0afdceb
2021-02-24 00:14:10 +00:00
Calin Juravle
6c7dcfeccc Merge "Always use the latest CLC for system server" am: c627177587
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584564

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I395c3c3bc7533ef3d45cca88b2a14e548b2677c5
2021-02-24 00:13:49 +00:00
Michael Wright
916d84985b Merge "Consolidate OWNERS for input" am: 471c70287e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1600293

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I365e6075c104f327331e08fc642c74d0050c21b5
2021-02-24 00:10:55 +00:00
Josh Gao
76528d5388 Merge "NativeTombstoneManager: fix tombstone parsing." am: 35a5c1501f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597312

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic17d60aee710d982cf6ee33e4fe0446a0a4d35e1
2021-02-24 00:07:51 +00:00