OSDN Git Service

android-x86/frameworks-base.git
5 years agoMerge "Add logging when parsing fails in DeviceConfig API getters."
Stanislav Zholnin [Wed, 13 Mar 2019 10:10:13 +0000 (10:10 +0000)]
Merge "Add logging when parsing fails in DeviceConfig API getters."

5 years agoMerge "Fix NotificationManagerServiceTest to properly use DeviceConfig API with shell...
Stanislav Zholnin [Wed, 13 Mar 2019 10:09:27 +0000 (10:09 +0000)]
Merge "Fix NotificationManagerServiceTest to properly use DeviceConfig API with shell permission identity in preparation to enforcement of permissions through ag/6055289."

5 years agoMerge "continue read file when returned count > 0" am: 894c578a02 am: 2a82e9a69c
Ganesh Mahendran [Wed, 13 Mar 2019 08:24:38 +0000 (01:24 -0700)]
Merge "continue read file when returned count > 0" am: 894c578a02 am: 2a82e9a69c
am: 289ccbd48d

Change-Id: I8921e6be0760cdedef05c74ae1e77e18b9bd2b04

5 years agoMerge "continue read file when returned count > 0" am: 894c578a02
Ganesh Mahendran [Wed, 13 Mar 2019 08:15:04 +0000 (01:15 -0700)]
Merge "continue read file when returned count > 0" am: 894c578a02
am: 2a82e9a69c

Change-Id: I2880bdc9157996d30472e3eddb714c498b14e66b

5 years agoMerge "continue read file when returned count > 0"
Ganesh Mahendran [Wed, 13 Mar 2019 07:59:30 +0000 (00:59 -0700)]
Merge "continue read file when returned count > 0"
am: 894c578a02

Change-Id: I43f5be6a4b365e2e7ea11ae413860d9cb0c37949

5 years agoMerge "Hide constructor of MediaController#PlaybackInfo"
Hyundo Moon [Wed, 13 Mar 2019 07:44:50 +0000 (07:44 +0000)]
Merge "Hide constructor of MediaController#PlaybackInfo"

5 years agoMerge "Make Session2Token#getExtras @NonNull"
TreeHugger Robot [Wed, 13 Mar 2019 07:44:15 +0000 (07:44 +0000)]
Merge "Make Session2Token#getExtras @NonNull"

5 years agoMerge "continue read file when returned count > 0"
Treehugger Robot [Wed, 13 Mar 2019 07:36:51 +0000 (07:36 +0000)]
Merge "continue read file when returned count > 0"

5 years agoMerge "Update #registerAppUsageLimitObserver to take time used."
TreeHugger Robot [Wed, 13 Mar 2019 07:23:27 +0000 (07:23 +0000)]
Merge "Update #registerAppUsageLimitObserver to take time used."

5 years agoMerge "Support partial connectivity probe result option" am: da0ebedb47 am: cca7cdc8d9
Chiachang Wang [Wed, 13 Mar 2019 07:18:17 +0000 (00:18 -0700)]
Merge "Support partial connectivity probe result option" am: da0ebedb47 am: cca7cdc8d9
am: 07b34ba935

Change-Id: I8781b8df0ec631cf4675335c30f7954254b0c617

5 years ago[automerger skipped] Merge "Call notifyStartupCompleted from reportFullyDrawn" am...
Mathieu Chartier [Wed, 13 Mar 2019 07:08:10 +0000 (00:08 -0700)]
[automerger skipped] Merge "Call notifyStartupCompleted from reportFullyDrawn" am: 13f15b3752 am: 96040ee591
am: 88b0f9bf9a -s ours
am skip reason: change_id I1134f66792bddc9ab33606fa4c2807b3918d5261 with SHA1 63e14c10b3 is in history

Change-Id: I39c83d7707bfc584aec731023dd4aeb1991c09ea

5 years agoMerge "Support partial connectivity probe result option" am: da0ebedb47
Chiachang Wang [Wed, 13 Mar 2019 07:07:49 +0000 (00:07 -0700)]
Merge "Support partial connectivity probe result option" am: da0ebedb47
am: cca7cdc8d9

Change-Id: Ic1ea01ee3d6ac2f01f843fbf71684b6f7b21bd41

5 years agoMerge "Use system composition sampling listener"
Winson Chung [Wed, 13 Mar 2019 07:02:52 +0000 (07:02 +0000)]
Merge "Use system composition sampling listener"

5 years agoMerge "Support partial connectivity probe result option"
Chiachang Wang [Wed, 13 Mar 2019 06:58:20 +0000 (23:58 -0700)]
Merge "Support partial connectivity probe result option"
am: da0ebedb47

Change-Id: Ia1696b640abd50b8a1e03cc6817c8e339e8ad104

5 years agoMerge "Rename entitlement callback to adhere to API guidelines." am: 0102e3d548 am...
Jeremy Klein [Wed, 13 Mar 2019 06:57:05 +0000 (23:57 -0700)]
Merge "Rename entitlement callback to adhere to API guidelines." am: 0102e3d548 am: 33a9d34e8a
am: 9eeac7326d

Change-Id: Iba73611c9330463f4517ac1555b6ee000d740c71

5 years agoMerge "Support partial connectivity probe result option"
Chiachang Wang [Wed, 13 Mar 2019 06:49:03 +0000 (06:49 +0000)]
Merge "Support partial connectivity probe result option"

5 years ago[automerger skipped] Merge "Only return one mobile subscription per group in Settings...
Xiangyu/Malcolm Chen [Wed, 13 Mar 2019 06:46:15 +0000 (23:46 -0700)]
[automerger skipped] Merge "Only return one mobile subscription per group in Settings." am: 58385e9796 am: c078d39d46
am: 7499f3a1c4 -s ours
am skip reason: change_id I867296b4f8efbdf2e9885ef34dd45806fa0abbca with SHA1 0e7ad2f3fe is in history

Change-Id: I1d9a8be8d264e5975c82eb9b710e7a1e3df78679

5 years agoMerge "Call notifyStartupCompleted from reportFullyDrawn" am: 13f15b3752
Mathieu Chartier [Wed, 13 Mar 2019 06:42:36 +0000 (23:42 -0700)]
Merge "Call notifyStartupCompleted from reportFullyDrawn" am: 13f15b3752
am: 96040ee591

Change-Id: I4aed2c47bd05a303acafbfc314eb9355a6491604

5 years agoMerge "Removed duplicate Passpoint entries in saved networks page"
TreeHugger Robot [Wed, 13 Mar 2019 06:39:22 +0000 (06:39 +0000)]
Merge "Removed duplicate Passpoint entries in saved networks page"

5 years agoMerge "Merge "Add @NonNull annotations to LE CoC APIs" am: 8b57ab7989 am: 68e00291e0...
Android Build Merger (Role) [Wed, 13 Mar 2019 06:37:43 +0000 (06:37 +0000)]
Merge "Merge "Add @NonNull annotations to LE CoC APIs" am: 8b57ab7989 am: 68e00291e0 am: f36e4f26a4"

5 years agoMerge "Add @NonNull annotations to LE CoC APIs" am: 8b57ab7989 am: 68e00291e0
Stanley Tng [Wed, 13 Mar 2019 06:37:09 +0000 (23:37 -0700)]
Merge "Add @NonNull annotations to LE CoC APIs" am: 8b57ab7989 am: 68e00291e0
am: f36e4f26a4

Change-Id: I674f926ff2822d311fd6f6a0cbf061a2e815b093

5 years agoMerge "Rename entitlement callback to adhere to API guidelines." am: 0102e3d548
Jeremy Klein [Wed, 13 Mar 2019 06:36:36 +0000 (23:36 -0700)]
Merge "Rename entitlement callback to adhere to API guidelines." am: 0102e3d548
am: 33a9d34e8a

Change-Id: I29bbf7cbbc0d87a9831762342d81496e6983df68

5 years agoMerge "Fix NPE in WMS"
TreeHugger Robot [Wed, 13 Mar 2019 06:35:21 +0000 (06:35 +0000)]
Merge "Fix NPE in WMS"

5 years ago[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" am...
Xin Li [Wed, 13 Mar 2019 06:27:24 +0000 (23:27 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" am: a5fe44c6b5 -s ours am: d82de1d484 -s ours
am: 20ce1174b8 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic21916d7b6cc4bfe909abfcdb882e19b54d3d643

5 years agoMerge "Only return one mobile subscription per group in Settings." am: 58385e9796
Xiangyu/Malcolm Chen [Wed, 13 Mar 2019 06:13:05 +0000 (23:13 -0700)]
Merge "Only return one mobile subscription per group in Settings." am: 58385e9796
am: c078d39d46

Change-Id: I748be95d8cf99ac03457ac740829cf5855331444

5 years agoMerge "Add @NonNull annotations to LE CoC APIs" am: 8b57ab7989
Stanley Tng [Wed, 13 Mar 2019 06:05:26 +0000 (23:05 -0700)]
Merge "Add @NonNull annotations to LE CoC APIs" am: 8b57ab7989
am: 68e00291e0

Change-Id: If0de3820ab36ddeaeb57d332f332a84963c8ad5d

5 years ago[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: 3e112d56a4...
Xin Li [Wed, 13 Mar 2019 05:58:29 +0000 (22:58 -0700)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: 3e112d56a4 -s ours am: c26c4f8e60 -s ours
am: 443ef127e1 -s ours
am skip reason: subject contains skip directive

Change-Id: I42cdb9318e387381a88bae71d1a44c29a354d752

5 years ago[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" am...
Xin Li [Wed, 13 Mar 2019 05:53:19 +0000 (22:53 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" am: a5fe44c6b5 -s ours
am: d82de1d484 -s ours
am skip reason: subject contains skip directive

Change-Id: I5860bb0aecbaf101773a7b92589899c60cf0dd88

5 years agoMerge "api-review: add @Nullable annotation in the argument of getMatchingOsuProviders"
TreeHugger Robot [Wed, 13 Mar 2019 05:52:21 +0000 (05:52 +0000)]
Merge "api-review: add @Nullable annotation in the argument of getMatchingOsuProviders"

5 years agoMerge "[automerger skipped] Merge "Tell the factory it is already serving a request...
Android Build Merger (Role) [Wed, 13 Mar 2019 05:48:55 +0000 (05:48 +0000)]
Merge "[automerger skipped] Merge "Tell the factory it is already serving a request." am: ae79013ec2 am: b8b94ba4c0 am: c94bd038f1 -s ours am skip reason: change_id I597ac588f76dd507512ff02868fd1310b7e63f7e with SHA1 08577fc579 is in history"

5 years ago[automerger skipped] Merge "Tell the factory it is already serving a request." am...
Chalard Jean [Wed, 13 Mar 2019 05:47:50 +0000 (22:47 -0700)]
[automerger skipped] Merge "Tell the factory it is already serving a request." am: ae79013ec2 am: b8b94ba4c0
am: c94bd038f1 -s ours
am skip reason: change_id I597ac588f76dd507512ff02868fd1310b7e63f7e with SHA1 08577fc579 is in history

Change-Id: I19e8d1b43338fa64eaccf9ae3039c878ff7cf3c5

5 years agoMerge "Add uid information in PackageListObserver"
TreeHugger Robot [Wed, 13 Mar 2019 05:45:34 +0000 (05:45 +0000)]
Merge "Add uid information in PackageListObserver"

5 years agoMerge "Call notifyStartupCompleted from reportFullyDrawn"
Mathieu Chartier [Wed, 13 Mar 2019 05:44:04 +0000 (22:44 -0700)]
Merge "Call notifyStartupCompleted from reportFullyDrawn"
am: 13f15b3752

Change-Id: I6c293f77639421a5517e0c56391e60982ce8ce31

5 years agoMerge "Temporarily disable flaky test." am: 3fb5ba9e61 am: 36da0beab3
Ian Kasprzak [Wed, 13 Mar 2019 05:40:38 +0000 (22:40 -0700)]
Merge "Temporarily disable flaky test." am: 3fb5ba9e61 am: 36da0beab3
am: 7c625e93c9

Change-Id: Ifcfee2d83c2a173f1cc2f22597aff3cffe558281

5 years agoMerge "Rename entitlement callback to adhere to API guidelines."
Jeremy Klein [Wed, 13 Mar 2019 05:39:53 +0000 (22:39 -0700)]
Merge "Rename entitlement callback to adhere to API guidelines."
am: 0102e3d548

Change-Id: If58d5724000fba5e1d794a98ccc89b73ce842f4a

5 years agoMerge "Only return one mobile subscription per group in Settings."
Xiangyu/Malcolm Chen [Wed, 13 Mar 2019 05:35:39 +0000 (22:35 -0700)]
Merge "Only return one mobile subscription per group in Settings."
am: 58385e9796

Change-Id: I2133bd9ba315a862a25fdd65afd981cbe34d5e62

5 years agoMerge "[automerger skipped] Merge "Schematize Crypto state system property" am: 88b57...
Android Build Merger (Role) [Wed, 13 Mar 2019 05:33:04 +0000 (05:33 +0000)]
Merge "[automerger skipped] Merge "Schematize Crypto state system property" am: 88b57a2c4d am: d5f216ac8b am: 82ce8e4176 -s ours am skip reason: change_id Id36208fac5d4de062a51d541b64145560242f8fc with SHA1 0de21d7e81 is in history"

5 years ago[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: 3e112d56a4...
Xin Li [Wed, 13 Mar 2019 05:31:18 +0000 (22:31 -0700)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: 3e112d56a4 -s ours
am: c26c4f8e60 -s ours
am skip reason: subject contains skip directive

Change-Id: Id71172612e6fc471b82af4066cce701fb3e289be

5 years agoMerge "Add @NonNull annotations to LE CoC APIs"
Stanley Tng [Wed, 13 Mar 2019 05:30:47 +0000 (22:30 -0700)]
Merge "Add @NonNull annotations to LE CoC APIs"
am: 8b57ab7989

Change-Id: I16c1d5c6c7c31b0c96172f0baaed361eae8f4a5e

5 years ago[automerger skipped] Merge "Schematize Crypto state system property" am: 88b57a2c4d...
Kiyoung Kim [Wed, 13 Mar 2019 05:30:44 +0000 (22:30 -0700)]
[automerger skipped] Merge "Schematize Crypto state system property" am: 88b57a2c4d am: d5f216ac8b
am: 82ce8e4176 -s ours
am skip reason: change_id Id36208fac5d4de062a51d541b64145560242f8fc with SHA1 0de21d7e81 is in history

Change-Id: I245a1982319a96c2ab312aac2e79d55b57396ae6

5 years agoMerge "Add slot based ICC channel APIs"
Jordan Liu [Wed, 13 Mar 2019 05:29:20 +0000 (05:29 +0000)]
Merge "Add slot based ICC channel APIs"

5 years agoMerge "Tell the factory it is already serving a request." am: ae79013ec2
Chalard Jean [Wed, 13 Mar 2019 05:21:24 +0000 (22:21 -0700)]
Merge "Tell the factory it is already serving a request." am: ae79013ec2
am: b8b94ba4c0

Change-Id: I8c89110d3b8d55fb8c516a966f4726d4059a098e

5 years agoMerge "[KA13]: add unit test for exposed TCP socket keepalive API." am: f1e012ae9b...
Xiao Ma [Wed, 13 Mar 2019 05:19:28 +0000 (22:19 -0700)]
Merge "[KA13]: add unit test for exposed TCP socket keepalive API." am: f1e012ae9b am: d3c00327b9
am: 8323ab407b

Change-Id: Ib2b2474a74e2e84b3bb75c36b518ad48009065af

5 years ago[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
Xin Li [Wed, 13 Mar 2019 05:17:07 +0000 (22:17 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
am: a5fe44c6b5 -s ours
am skip reason: subject contains skip directive

Change-Id: I1ef13e9b82d2f5b55a603c00105fbc6fb392dcc8

5 years agoMerge "Temporarily disable flaky test." am: 3fb5ba9e61
Ian Kasprzak [Wed, 13 Mar 2019 05:15:44 +0000 (22:15 -0700)]
Merge "Temporarily disable flaky test." am: 3fb5ba9e61
am: 36da0beab3

Change-Id: Ice8e6cd6cad901ca937ca0953049c2f9c83548f8

5 years agoMerge "add NonNull annotation to API" am: 56c9d22970 am: 69e802e6e6
Josh Hou [Wed, 13 Mar 2019 05:10:54 +0000 (22:10 -0700)]
Merge "add NonNull annotation to API" am: 56c9d22970 am: 69e802e6e6
am: 8d19949c4c

Change-Id: I92bad21050b4396d1bb3588cd42d78a1c662903c

5 years agoMerge "Schematize Crypto state system property" am: 88b57a2c4d
Kiyoung Kim [Wed, 13 Mar 2019 05:08:25 +0000 (22:08 -0700)]
Merge "Schematize Crypto state system property" am: 88b57a2c4d
am: d5f216ac8b

Change-Id: I38fa65ef0864d8a40eb7546ad50ab254e7e0ec25

5 years agoMerge "Call notifyStartupCompleted from reportFullyDrawn"
Mathieu Chartier [Wed, 13 Mar 2019 05:02:58 +0000 (05:02 +0000)]
Merge "Call notifyStartupCompleted from reportFullyDrawn"

5 years agoCall notifyStartupCompleted from reportFullyDrawn
Mathieu Chartier [Thu, 7 Mar 2019 17:05:44 +0000 (09:05 -0800)]
Call notifyStartupCompleted from reportFullyDrawn

ART will now know when startup is startup is finished.

Test: manual
Bug: 120671223
Bug: 123377072

(cherry-picked from commit 63e14c10b3f7b2c9709b98cb9f128a2a817d4968)

Merged-In: I1134f66792bddc9ab33606fa4c2807b3918d5261
Change-Id: I1134f66792bddc9ab33606fa4c2807b3918d5261

5 years agoMerge "[KA13]: add unit test for exposed TCP socket keepalive API." am: f1e012ae9b
Xiao Ma [Wed, 13 Mar 2019 05:01:06 +0000 (22:01 -0700)]
Merge "[KA13]: add unit test for exposed TCP socket keepalive API." am: f1e012ae9b
am: d3c00327b9

Change-Id: I2a2061df07612a9415528e18c6f741e750127adb

5 years ago[automerger skipped] Merge "DO NOT MERGE: Don't let previous activity wait if next...
Tiger Huang [Wed, 13 Mar 2019 04:57:23 +0000 (21:57 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Don't let previous activity wait if next activity won't be visible" into pi-dev am: 2eec1279c6
am: beb2c31a0d -s ours
am skip reason: subject contains skip directive

Change-Id: I1f5f4ef206902220e12c671e2b8c276b89a23d17

5 years agoMerge "[automerger skipped] Merge "Add carrier's option to cancel CS reject cause...
Android Build Merger (Role) [Wed, 13 Mar 2019 04:55:54 +0000 (04:55 +0000)]
Merge "[automerger skipped] Merge "Add carrier's option to cancel CS reject cause notification" into pi-dev-plus-aosp am: 0fd9d60cea -s ours am skip reason: change_id If4c696e8116094d0cb555fe87c92243af1f34cec with SHA1 d351dba3a2 is in history"

5 years ago[automerger skipped] Merge "Add carrier's option to cancel CS reject cause notificati...
Jordan Liu [Wed, 13 Mar 2019 04:55:23 +0000 (21:55 -0700)]
[automerger skipped] Merge "Add carrier's option to cancel CS reject cause notification" into pi-dev-plus-aosp
am: 0fd9d60cea -s ours
am skip reason: change_id If4c696e8116094d0cb555fe87c92243af1f34cec with SHA1 d351dba3a2 is in history

Change-Id: I0f8a0e52c6f33409398fbd9b9fb012fdae0bf523

5 years agoMerge "add NonNull annotation to API" am: 56c9d22970
Josh Hou [Wed, 13 Mar 2019 04:55:13 +0000 (21:55 -0700)]
Merge "add NonNull annotation to API" am: 56c9d22970
am: 69e802e6e6

Change-Id: Ieed6eba51fc2c3fdf7823415c783482a77c2d29c

5 years agoMerge "Add new Secure Setting to FrameworksCoreTest"
Nadav Bar [Wed, 13 Mar 2019 04:54:28 +0000 (04:54 +0000)]
Merge "Add new Secure Setting to FrameworksCoreTest"

5 years agoMerge "Adding the on-device captions service toggle into the volume rocker."
Nadav Bar [Wed, 13 Mar 2019 04:54:28 +0000 (04:54 +0000)]
Merge "Adding the on-device captions service toggle into the volume rocker."

5 years ago[automerger skipped] Add carrier's option to cancel CS reject cause notification
Seongho Kim [Wed, 13 Mar 2019 04:50:35 +0000 (21:50 -0700)]
[automerger skipped] Add carrier's option to cancel CS reject cause notification
am: 431e03a6f8 -s ours
am skip reason: change_id If4c696e8116094d0cb555fe87c92243af1f34cec with SHA1 d351dba3a2 is in history

Change-Id: Ie624d26e855f24b0bd4d6172e9db7b42e366e26f

5 years agoMerge "Rename entitlement callback to adhere to API guidelines."
Treehugger Robot [Wed, 13 Mar 2019 04:48:24 +0000 (04:48 +0000)]
Merge "Rename entitlement callback to adhere to API guidelines."

5 years ago[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master
Xin Li [Wed, 13 Mar 2019 04:44:30 +0000 (21:44 -0700)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master
am: 3e112d56a4 -s ours
am skip reason: subject contains skip directive

Change-Id: Id7415c8795196d717dbb4093e2d060a951c0de03

5 years agoMerge "Tell the factory it is already serving a request."
Chalard Jean [Wed, 13 Mar 2019 04:42:18 +0000 (21:42 -0700)]
Merge "Tell the factory it is already serving a request."
am: ae79013ec2

Change-Id: I4c3948c2e7098668cf881d3f31fda87be1250828

5 years agoMerge "Temporarily disable flaky test."
Ian Kasprzak [Wed, 13 Mar 2019 04:38:43 +0000 (21:38 -0700)]
Merge "Temporarily disable flaky test."
am: 3fb5ba9e61

Change-Id: Ie482f459c2f8bce40098657daa39efccfdf2bcd3

5 years agoMerge "Schematize Crypto state system property"
Kiyoung Kim [Wed, 13 Mar 2019 04:33:34 +0000 (21:33 -0700)]
Merge "Schematize Crypto state system property"
am: 88b57a2c4d

Change-Id: Idb96ab95b1ea69a636f315edeb84c8ba025d75bd

5 years agoMerge "DO NOT MERGE: Don't let previous activity wait if next activity won't be visib...
Tiger Huang [Wed, 13 Mar 2019 04:32:11 +0000 (21:32 -0700)]
Merge "DO NOT MERGE: Don't let previous activity wait if next activity won't be visible" into pi-dev
am: 2eec1279c6

Change-Id: I8403fd309da5f0390b02dc0999606ca0c78b6638

5 years agoMerge "[KA13]: add unit test for exposed TCP socket keepalive API."
Xiao Ma [Wed, 13 Mar 2019 04:29:48 +0000 (21:29 -0700)]
Merge "[KA13]: add unit test for exposed TCP socket keepalive API."
am: f1e012ae9b

Change-Id: I79fb97913e8b69c525733dcaec59a60ac6b980b6

5 years agoMerge "add NonNull annotation to API"
Josh Hou [Wed, 13 Mar 2019 04:26:18 +0000 (21:26 -0700)]
Merge "add NonNull annotation to API"
am: 56c9d22970

Change-Id: Iaa22836680e45c4244a4380d9688b968b7877c8e

5 years ago[automerger skipped] Merge "Don't return hidden subscription in getActiveSubIdList...
Xiangyu/Malcolm Chen [Wed, 13 Mar 2019 04:25:08 +0000 (21:25 -0700)]
[automerger skipped] Merge "Don't return hidden subscription in getActiveSubIdList" am: d2cb5a0608 am: 851ec326d9
am: 0a0213e493 -s ours
am skip reason: change_id I46ccae88167c2988d71a6e07da2937bf9644a1f0 with SHA1 d91d6b24f8 is in history

Change-Id: I1403c7600f08c2a5b6f4647d5d2844bf88a9ebe6

5 years ago[automerger skipped] Merge "Don't return hidden subscription in getActiveSubscription...
Xiangyu/Malcolm Chen [Wed, 13 Mar 2019 04:14:24 +0000 (21:14 -0700)]
[automerger skipped] Merge "Don't return hidden subscription in getActiveSubscriptionInfoList." am: 8cbe957dba am: 6dc894e962
am: 1eb9df2088 -s ours
am skip reason: change_id I3a9f3a9a2628a8e2ad1c401f6fe5e4c5866a0047 with SHA1 5b16f8d92b is in history

Change-Id: I4fa2131138161b96779962ef413c42b1237c29db

5 years agoMerge "Only return one mobile subscription per group in Settings."
Xiangyu/Malcolm Chen [Wed, 13 Mar 2019 04:14:14 +0000 (04:14 +0000)]
Merge "Only return one mobile subscription per group in Settings."

5 years agoOnly return one mobile subscription per group in Settings.
Malcolm Chen [Wed, 27 Feb 2019 00:48:40 +0000 (16:48 -0800)]
Only return one mobile subscription per group in Settings.

Right now getSelectableSubscriptionInfoList returns all subscriptions
that are visible and available. But we should only show one per
subscription group. So updating getSelectableSubscriptionInfoList
to make sure of it.

Bug: 126438122
Test: manual - group Fi primary subscriptions and make sure only
one Fi subscription is shown in Settings UI.
Change-Id: I867296b4f8efbdf2e9885ef34dd45806fa0abbca
Merged-In: I867296b4f8efbdf2e9885ef34dd45806fa0abbca

5 years agoMerge "MediaDrm: create Executor overload for callback APIs"
TreeHugger Robot [Wed, 13 Mar 2019 04:01:18 +0000 (04:01 +0000)]
Merge "MediaDrm: create Executor overload for callback APIs"

5 years agoMerge "Auto dismiss heads-up notification according to accessibility timeout"
Dieter Hsu [Wed, 13 Mar 2019 03:42:37 +0000 (03:42 +0000)]
Merge "Auto dismiss heads-up notification according to accessibility timeout"

5 years agoMerge "Call notifyStartupCompleted from reportFullyDrawn"
Mathieu Chartier [Wed, 13 Mar 2019 03:23:19 +0000 (03:23 +0000)]
Merge "Call notifyStartupCompleted from reportFullyDrawn"

5 years agoMerge "Fix bug setting the 9th bit of a mFieldsMask byte."
Pierre Fite-georgel [Wed, 13 Mar 2019 03:10:31 +0000 (03:10 +0000)]
Merge "Fix bug setting the 9th bit of a mFieldsMask byte."

5 years agoMake Session2Token#getExtras @NonNull
Hyundo Moon [Wed, 13 Mar 2019 01:41:07 +0000 (10:41 +0900)]
Make Session2Token#getExtras @NonNull

Bug: 128413976
Test: atest CtsMediaTestCases:android.media.cts.MediaSession2Test;
      atest CtsMediaTestCases:android.media.cts.MediaController2Test;
      atest CtsMediaTestCases:android.media.cts.MediaSession2ServiceTest;
Change-Id: I007efc4318d2bbf0e3849cc00f22ff9dac9784da

5 years agoMerge "Allow registering multiple RemoteVolumeController"
Hyundo Moon [Wed, 13 Mar 2019 02:59:35 +0000 (02:59 +0000)]
Merge "Allow registering multiple RemoteVolumeController"

5 years agoMerge "Help on issue #128350014: runInstallCreate from pm command asks..."
TreeHugger Robot [Wed, 13 Mar 2019 02:31:39 +0000 (02:31 +0000)]
Merge "Help on issue #128350014: runInstallCreate from pm command asks..."

5 years agoMerge "Add @NonNull annotations to LE CoC APIs"
Treehugger Robot [Wed, 13 Mar 2019 02:28:32 +0000 (02:28 +0000)]
Merge "Add @NonNull annotations to LE CoC APIs"

5 years agoAdd @NonNull annotations to LE CoC APIs
Stanley Tng [Tue, 12 Mar 2019 17:19:49 +0000 (10:19 -0700)]
Add @NonNull annotations to LE CoC APIs

Added NonNull annotations to the 4 LE Connection-oriented channel API in
BluetoothDevice and BluetoothAdapter.

Bug: 126701988
Bug: 126701989
Test: Compile only
Change-Id: I2d4dc8fbd06e30c782123e01f8481d249e40ee02

5 years agoMerge "DO NOT MERGE - Merge PPRL.190305.001 into master"
Xin Li [Wed, 13 Mar 2019 02:26:04 +0000 (02:26 +0000)]
Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"

5 years agoMerge "Tell the factory it is already serving a request."
Chalard Jean [Wed, 13 Mar 2019 02:07:29 +0000 (02:07 +0000)]
Merge "Tell the factory it is already serving a request."

5 years agoMerge "Add logging for doze trigger reasons."
TreeHugger Robot [Wed, 13 Mar 2019 02:02:06 +0000 (02:02 +0000)]
Merge "Add logging for doze trigger reasons."

5 years agoMerge changes from topic "gpustats-statsd-2"
TreeHugger Robot [Wed, 13 Mar 2019 02:01:05 +0000 (02:01 +0000)]
Merge changes from topic "gpustats-statsd-2"

* changes:
  Game Driver Metrics: add tests for GpuStatsPuller
  Game Driver Metrics: get gpu app stats with GpuStatsPuller

5 years agoMerge "Temporarily disable flaky test."
Ian Kasprzak [Wed, 13 Mar 2019 01:52:21 +0000 (01:52 +0000)]
Merge "Temporarily disable flaky test."

5 years agoMerge "Schematize Crypto state system property"
Treehugger Robot [Wed, 13 Mar 2019 01:30:58 +0000 (01:30 +0000)]
Merge "Schematize Crypto state system property"

5 years agoMerge "[KA13]: add unit test for exposed TCP socket keepalive API."
Xiao Ma [Wed, 13 Mar 2019 01:13:08 +0000 (01:13 +0000)]
Merge "[KA13]: add unit test for exposed TCP socket keepalive API."

5 years agoMerge "Always suppress font error during resource loading"
TreeHugger Robot [Wed, 13 Mar 2019 01:05:39 +0000 (01:05 +0000)]
Merge "Always suppress font error during resource loading"

5 years agoMerge "add NonNull annotation to API"
Josh Hou [Wed, 13 Mar 2019 00:58:21 +0000 (00:58 +0000)]
Merge "add NonNull annotation to API"

5 years agoMerge "Audio service: restrict conditions to send ACTION_AUDIO_BECOMING_NOISY"
TreeHugger Robot [Wed, 13 Mar 2019 00:55:25 +0000 (00:55 +0000)]
Merge "Audio service: restrict conditions to send ACTION_AUDIO_BECOMING_NOISY"

5 years agoMerge "Test staged rollback for apk and apex install"
Shafik Nassar [Wed, 13 Mar 2019 00:29:09 +0000 (00:29 +0000)]
Merge "Test staged rollback for apk and apex install"

5 years agoTemporarily disable flaky test.
Lorenzo Colitti [Wed, 13 Mar 2019 00:23:50 +0000 (09:23 +0900)]
Temporarily disable flaky test.

Test: None
Bug: 128426024
Change-Id: Id88bf452f41f512703d5831e357d9ba72dc5b911

5 years agoMerge "DO NOT MERGE: Don't let previous activity wait if next activity won't be visib...
Tiger Huang [Wed, 13 Mar 2019 00:21:27 +0000 (00:21 +0000)]
Merge "DO NOT MERGE: Don't let previous activity wait if next activity won't be visible" into pi-dev

5 years agoMerge "Disable any fullScreenIntent launches in SystemUI."
TreeHugger Robot [Wed, 13 Mar 2019 00:11:57 +0000 (00:11 +0000)]
Merge "Disable any fullScreenIntent launches in SystemUI."

5 years agoMerge "Add carrier's option to cancel CS reject cause notification" into pi-dev-plus...
Jordan Liu [Wed, 13 Mar 2019 00:10:31 +0000 (00:10 +0000)]
Merge "Add carrier's option to cancel CS reject cause notification" into pi-dev-plus-aosp

5 years agoMerge "Revert^3 "Delay start of bootanimation until after the Runtime APEX is mounted...
Jiyong Park [Tue, 12 Mar 2019 23:50:26 +0000 (16:50 -0700)]
Merge "Revert^3 "Delay start of bootanimation until after the Runtime APEX is mounted."" am: 1a14dedcce am: 6623e402b3
am: 1c64a73f91

Change-Id: I1cf5a65959d3a2d4cba292c532afddebf58d9683

5 years agoFix bug setting the 9th bit of a mFieldsMask byte.
Tyler Trephan [Tue, 12 Mar 2019 23:20:20 +0000 (16:20 -0700)]
Fix bug setting the 9th bit of a mFieldsMask byte.

Fix: 127516341
Test: Passed LocationTest CTS test.
Change-Id: Ib56daccd33e6362434e466211236a5eb4d3a4610

5 years agoMerge "[API Feedback] Rename DebugEventReporter" am: 3a6dcad0a3 am: e80b170949
Nathan Harold [Tue, 12 Mar 2019 23:37:57 +0000 (16:37 -0700)]
Merge "[API Feedback] Rename DebugEventReporter" am: 3a6dcad0a3 am: e80b170949
am: 53fb0789fb

Change-Id: If7d117810bd56d6057cb99e79f52def579b5a089

5 years agoMerge "Don't return hidden subscription in getActiveSubIdList" am: d2cb5a0608
Xiangyu/Malcolm Chen [Tue, 12 Mar 2019 23:36:02 +0000 (16:36 -0700)]
Merge "Don't return hidden subscription in getActiveSubIdList" am: d2cb5a0608
am: 851ec326d9

Change-Id: I9356cfd364f7a9d65c299a10d9aea37f1d3d79de

5 years agoMerge "Add Tron logging of explanation for notification importance."
Will Brockman [Tue, 12 Mar 2019 23:26:47 +0000 (23:26 +0000)]
Merge "Add Tron logging of explanation for notification importance."

5 years agoMerge "Don't return hidden subscription in getActiveSubscriptionInfoList." am: 8cbe957dba
Xiangyu/Malcolm Chen [Tue, 12 Mar 2019 23:25:18 +0000 (16:25 -0700)]
Merge "Don't return hidden subscription in getActiveSubscriptionInfoList." am: 8cbe957dba
am: 6dc894e962

Change-Id: Idc50eab22bc89207868349a96dfbc38783125165

5 years agoMerge "Correct registerNativeAllocation type" am: fe015a098c am: 90e8135f1e
Hans Boehm [Tue, 12 Mar 2019 23:23:19 +0000 (16:23 -0700)]
Merge "Correct registerNativeAllocation type" am: fe015a098c am: 90e8135f1e
am: ecb7e4a77b

Change-Id: I2ba5370ad1f6f3b8f0ad757c0993b5c399baaea7