Commit Graph

628358 Commits

Author SHA1 Message Date
Michael Groover
c717ef5964 Merge "Report UnsafeIntentLaunchViolation for Intents parsed from URIs" into sc-dev 2021-03-10 01:06:03 +00:00
Remi NGUYEN VAN
fe73dc1faf Merge "Remove unused buildNetworkIdentity" am: f182642b86 am: eef71ecf11 am: b61beb575e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622670

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd1c5f5fc46131f6e5b586b76505e7f666547e96
2021-03-10 00:54:43 +00:00
Jeff Sharkey
e394c59a75 Merge "Wait for installd to start to perform dexopt operation" am: 3f0f0b686a am: ee20cc3ca1 am: d2cd30f2cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615847

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01a6b4f516ee1e74707babc10e5846d5cbfb61fe
2021-03-10 00:53:43 +00:00
TreeHugger Robot
219aea8c64 Merge "Separating quota window for pre-S apps" into sc-dev 2021-03-10 00:28:08 +00:00
Remi NGUYEN VAN
b61beb575e Merge "Remove unused buildNetworkIdentity" am: f182642b86 am: eef71ecf11
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622670

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6517777a7a2922d1d7cee0fabe4dbe2cd286800c
2021-03-10 00:05:51 +00:00
Jeff Sharkey
d2cd30f2cc Merge "Wait for installd to start to perform dexopt operation" am: 3f0f0b686a am: ee20cc3ca1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615847

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b80a78b7e017e7c8bce69d856b321de6dc9357d
2021-03-10 00:05:37 +00:00
Eugene Susla
3f4814f5dc Merge "Update CDM strings per UX review" into sc-dev 2021-03-09 23:40:37 +00:00
Remi NGUYEN VAN
eef71ecf11 Merge "Remove unused buildNetworkIdentity" am: f182642b86
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622670

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9725e5994731a3f5fd8a9044e82e39f02c61f8a
2021-03-09 23:29:15 +00:00
Jeff Sharkey
ee20cc3ca1 Merge "Wait for installd to start to perform dexopt operation" am: 3f0f0b686a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615847

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77a5719fe279c066386fbff2c279bb4caee3c052
2021-03-09 23:23:24 +00:00
Hui Yu
86cde2c6a0 Merge "Allow BG-FGS-Launch for role EMERGENCY, SYSTEM_GALLERY and SMS." into sc-dev 2021-03-09 23:16:15 +00:00
Rahul Sabnis
d65ce8e59f Merge "Derestrict some APIs." am: 8e97fea3c2 am: 4651bc7b96 am: 6b93271842
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623840

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I467147251bf2f581bc3c5bbb823324660bd935fe
2021-03-09 23:10:06 +00:00
Remi NGUYEN VAN
f182642b86 Merge "Remove unused buildNetworkIdentity" 2021-03-09 23:01:45 +00:00
Jeff Sharkey
3f0f0b686a Merge "Wait for installd to start to perform dexopt operation" 2021-03-09 23:01:37 +00:00
Remi NGUYEN VAN
020348499e Merge "Add Ethernet, TestNetworkSpecifier API" into sc-dev 2021-03-09 22:43:46 +00:00
TreeHugger Robot
46c0a4b925 Merge "BootReceiver: cap the number of sent kernel memory corruptions" into sc-dev 2021-03-09 22:37:06 +00:00
Jeff Sharkey
c8faccf35a Merge changes from topic "mar8" into sc-dev
* changes:
  Refinement of ContextParams behavior.
  Relax null checks to fix tests.
2021-03-09 22:35:49 +00:00
TreeHugger Robot
b41c7af72c Merge "Deprecate Display#getRealSize / getRealMetrics, and direct users to WindowManager#getCurrentWindowMetrics instead" into sc-dev 2021-03-09 22:34:59 +00:00
TreeHugger Robot
a701830c12 Merge "PIN/PUK Views not showing after boot" into sc-dev 2021-03-09 22:29:15 +00:00
Rahul Sabnis
6b93271842 Merge "Derestrict some APIs." am: 8e97fea3c2 am: 4651bc7b96
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623840

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib54b45221376ca62609682ee97d41e45956f0ffd
2021-03-09 22:28:26 +00:00
Christine Franks
a8ef1df970 Merge "Update BrightnessTrackerTest" into sc-dev 2021-03-09 22:19:58 +00:00
Rahul Sabnis
4651bc7b96 Merge "Derestrict some APIs." am: 8e97fea3c2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623840

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I673b9bcb6fbc35f601ca017fafa7ca2ac53f5f61
2021-03-09 21:50:00 +00:00
Rahul Sabnis
8e97fea3c2 Merge "Derestrict some APIs." 2021-03-09 21:29:12 +00:00
Mathew Inwood
cbc3132096 Derestrict some APIs.
They were retricted because we thought they were unused, but it turns out
that they are needed afterall.

NoNonSdkCheck: 170729553

Bug: 181103983
Test: N/A
Change-Id: Iddf7916456be27d60d2a7520d7cadcda1d04cac6
2021-03-09 21:24:00 +00:00
TreeHugger Robot
5ef41d061b Merge "Camera: Don't switch image callbacks during extension sessions" into sc-dev 2021-03-09 21:16:39 +00:00
TreeHugger Robot
0fc7ecde5c Merge "Update the Call Strength icons to support 0~4 bars" into sc-dev 2021-03-09 21:14:42 +00:00
Ryan Mitchell
aff259e622 Merge "OMS: 'cmd overlay lookup': support --user" am: 5267d0e0d6 am: d64094cf30 am: 7203735926
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01d0774f15b1df263aef631aa06db41bf1feb6dd
2021-03-09 20:47:29 +00:00
Tianjie Xu
aa7c7cc3e9 Merge "Make the new proto build" am: 606a64f7da am: 3077dfa613 am: 86f922435f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622206

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff934cbf94a2abd4cc941a60c316538cdf787e15
2021-03-09 20:46:41 +00:00
Tianjie Xu
5e5e891851 Merge "Fix ResumeOnRebootServiceProviderTests" am: db8ed62e01 am: aae8912a37 am: 1c5e5fe444
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623182

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id02a0b6f083dd7b448aa6c08f614630fe10bcd7f
2021-03-09 20:45:43 +00:00
Todd Kennedy
f990e60707 Merge "Add owners" am: ca9bcca560 am: 84812f6d12 am: 1f3a49233f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624099

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80a1e6c9ee88be605a8087efea73d9d25391dcf7
2021-03-09 20:45:21 +00:00
Jeff Sharkey
119cf833ad Merge "Update OWNERS file for GraphicsEnvironment" am: 5b7186f65d am: f4a2795bb8 am: dce433b181
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f8d55be3864027ed5f65d6fefd58d13e1b4c175
2021-03-09 20:44:58 +00:00
Ryan Mitchell
7203735926 Merge "OMS: 'cmd overlay lookup': support --user" am: 5267d0e0d6 am: d64094cf30
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2961b4276f4f6cc4095a15b9159912ee5c571f4
2021-03-09 20:19:20 +00:00
Tianjie Xu
86f922435f Merge "Make the new proto build" am: 606a64f7da am: 3077dfa613
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622206

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a55613a0b49a51bf1901a4eaed01a8d7ab6255c
2021-03-09 20:00:23 +00:00
Tianjie Xu
1c5e5fe444 Merge "Fix ResumeOnRebootServiceProviderTests" am: db8ed62e01 am: aae8912a37
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623182

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81d0d2d799150d8bcf66b350b9a52998999b347a
2021-03-09 19:59:36 +00:00
Todd Kennedy
1f3a49233f Merge "Add owners" am: ca9bcca560 am: 84812f6d12
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624099

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23ed90655e4aed009960086b20d98bbe3b24dd6c
2021-03-09 19:59:21 +00:00
Jeff Sharkey
dce433b181 Merge "Update OWNERS file for GraphicsEnvironment" am: 5b7186f65d am: f4a2795bb8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib9be0b00869616ae72f6a51be4732693b7f66b22
2021-03-09 19:59:04 +00:00
Ryan Mitchell
d64094cf30 Merge "OMS: 'cmd overlay lookup': support --user" am: 5267d0e0d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I906257c415070a165bd91e6f51ab84aa51ce46b5
2021-03-09 19:57:55 +00:00
Fabian Kozynski
e4ba4f837d Merge "Fix color animation" into sc-dev 2021-03-09 19:54:24 +00:00
Youngjun Kwak
c7677faff0 [automerger skipped] Merge "DO NOT MERGE Do not reinflate the layout if it has not been already inflated." into rvc-qpr-dev am: ed260d837f am: 57cefc366e -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2fcb5d9f416078a24cf3aedcd26058fc0b14b251
2021-03-09 19:42:44 +00:00
kwaky
92e92b6b72 [automerger skipped] DO NOT MERGE Do not reinflate the layout if it has not been already inflated. am: b700beab66 am: 15780ebbc0 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c852a8883c62bb9d547cf0ae0ec7d834c03adca
2021-03-09 19:42:19 +00:00
Ryan Mitchell
5267d0e0d6 Merge "OMS: 'cmd overlay lookup': support --user" 2021-03-09 19:41:34 +00:00
Tianjie Xu
3077dfa613 Merge "Make the new proto build" am: 606a64f7da
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622206

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id591371447cccbe6ad90ff2ff066068f9ead3167
2021-03-09 19:27:16 +00:00
Tianjie Xu
aae8912a37 Merge "Fix ResumeOnRebootServiceProviderTests" am: db8ed62e01
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623182

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9aec1678237a4d243da65d21f65026f5334591c3
2021-03-09 19:23:08 +00:00
Tianjie Xu
606a64f7da Merge "Make the new proto build" 2021-03-09 19:22:18 +00:00
Tianjie Xu
db8ed62e01 Merge "Fix ResumeOnRebootServiceProviderTests" 2021-03-09 19:20:17 +00:00
Todd Kennedy
84812f6d12 Merge "Add owners" am: ca9bcca560
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624099

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic533ddddac42b44406b7197af31d4224143f0c54
2021-03-09 19:20:14 +00:00
Jeff Sharkey
f4a2795bb8 Merge "Update OWNERS file for GraphicsEnvironment" am: 5b7186f65d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d4bc7d14df6bbf3f965d91daf4933cc0dd40178
2021-03-09 19:17:03 +00:00
Todd Kennedy
ca9bcca560 Merge "Add owners" 2021-03-09 19:11:05 +00:00
Adam He
a47c17768c Merge "Full refactor of Translation APIs." into sc-dev 2021-03-09 19:05:54 +00:00
Felipe Leme
8ead8216dd Merge "Restricts PersonalAppsSuspensionHelper.dump() to system user." into sc-dev 2021-03-09 19:02:44 +00:00
Youngjun Kwak
57cefc366e Merge "DO NOT MERGE Do not reinflate the layout if it has not been already inflated." into rvc-qpr-dev am: ed260d837f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13807481

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa728a75c7514ea433947333d082ee613305801c
2021-03-09 18:56:40 +00:00