Commit Graph

625769 Commits

Author SHA1 Message Date
tim peng
d38c0368af Merge "Refactor EXTRA_PACKAGE_NAME to a generic string" into sc-dev 2021-02-24 03:31:37 +00:00
tim peng
d4a92b6976 Merge "[Fix] Bluetooth device ordering" into sc-dev 2021-02-24 03:30:02 +00:00
Kevin Chyn
eef75a4842 Merge "Add re-enrollment notification for face AIDL" into sc-dev 2021-02-24 03:17:15 +00:00
Wu Ahan
f6ed5fc57c Merge "Send broadcast to notify the events of a CUJ session" into sc-dev 2021-02-24 02:48:48 +00:00
Treehugger Robot
052c8cae69 [automerger skipped] Merge "Defer UID data removal until after reading is finished" am: ce2d40870e am: 7fddb382f7 am: 155808b3e2 -s ours
am skip reason: Change-Id I38e037b89e71b0cb1ba01374189ba8b7af01d632 with SHA-1 9451197708 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I761d254de2413b06c51bf7c4994f8d8c12a01fb5
2021-02-24 02:19:08 +00:00
Roshan Pius
a9bc44cf1b [automerger skipped] Merge "Add getTargetSdkVersion without AppInfo" am: f8ab9c895b am: 1d024a0e6a am: 7394e95f36 -s ours
am skip reason: Change-Id Ibe1a3e977cd71b23e26395eb6cc73f61c1a85a0e with SHA-1 050de3f78b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab3d8a09ea809c9d4c5495991f838c917292465b
2021-02-24 02:17:30 +00:00
Andrei-Valentin Onea
b7c2f8d754 [automerger skipped] Merge "Create non updatable system server stubs" am: 359eca32b3 am: a03cf88ecd am: 88e092a602 -s ours
am skip reason: Change-Id Iecb9d51472ae238bbeabe65e1cd782b7c8a4ce59 with SHA-1 43114704e6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4833704b1494516871d8a2c8ba24c3ea741266d2
2021-02-24 02:11:59 +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
Evan Severson
0088eefaac Merge "Remove permission correcting code" into sc-dev 2021-02-24 01:32:03 +00:00
TreeHugger Robot
7b68417fe8 Merge "CachedAppOptimizer: fix fd leak." into sc-dev 2021-02-24 01:31: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
Kevin Han
e040263f27 Merge "Check user states exist before package add/removal" am: 486816e35f am: aee5302128 am: 8c14a6863e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593100

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b7028aa8bb303edf27f4ff93f54a753d0b4ee78
2021-02-24 01:08:24 +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
Calin Juravle
4d03c52660 Merge "Always use the latest CLC for system server" am: c627177587 am: 6c7dcfeccc am: 8900f912e5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584564

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b10842a46df176c2ff0ff8f8a77dd5be0cb41f0
2021-02-24 01:07:39 +00:00
Matt Casey
656e9cce40 Merge "Follow-on fixes for long screenshot activity" into sc-dev 2021-02-24 01:02:09 +00:00
Lucas Dupin
e36c4de103 Merge "Revert "[framework] Integrate new quantizers"" into sc-dev 2021-02-24 01:00:49 +00:00
Lucas Dupin
2b821d14bc Merge "Fix background colors on some themes" into sc-dev 2021-02-24 00:55:33 +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
TreeHugger Robot
f6d8a8390b Merge "Update toast parameters instead of re-adding" into sc-dev 2021-02-24 00:34:02 +00:00
James O'Leary
96169052c4 Revert "[framework] Integrate new quantizers"
Revert "[sysuig] Integrate Monet color extraction to theme algorithm"

Revert submission 13554372-kahuna

Reason for revert: Colors on some wallpapers shifted, and Lucas found a couple big reasons why, would rather revert a revert tomorrow than fix forward today
Reverted Changes:
I2c3df9f71:[sysuig] Integrate Monet color extraction to theme...
I0fc60a134:[framework] Integrate new quantizers

Change-Id: I7eb8e4fde243bf62e8c750f88028db0a427560b5
2021-02-24 00:33:02 +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