OSDN Git Service
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
TreeHugger Robot [Wed, 13 Mar 2019 06:39:22 +0000 (06:39 +0000)]
Merge "Removed duplicate Passpoint entries in saved networks page"
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"
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
TreeHugger Robot [Wed, 13 Mar 2019 06:35:21 +0000 (06:35 +0000)]
Merge "Fix NPE in WMS"
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
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
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
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
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
TreeHugger Robot [Wed, 13 Mar 2019 05:52:21 +0000 (05:52 +0000)]
Merge "api-review: add @Nullable annotation in the argument of getMatchingOsuProviders"
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"
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
TreeHugger Robot [Wed, 13 Mar 2019 05:45:34 +0000 (05:45 +0000)]
Merge "Add uid information in PackageListObserver"
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
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
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"
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
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
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
Jordan Liu [Wed, 13 Mar 2019 05:29:20 +0000 (05:29 +0000)]
Merge "Add slot based ICC channel APIs"
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
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
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
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
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
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
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
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
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"
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
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
Nadav Bar [Wed, 13 Mar 2019 04:54:28 +0000 (04:54 +0000)]
Merge "Add new Secure Setting to FrameworksCoreTest"
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."
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
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
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
Ian Kasprzak [Wed, 13 Mar 2019 04:38:43 +0000 (21:38 -0700)]
Merge "Temporarily disable flaky test."
am:
3fb5ba9e61
Change-Id: Ie482f459c2f8bce40098657daa39efccfdf2bcd3
Kiyoung Kim [Wed, 13 Mar 2019 04:33:34 +0000 (21:33 -0700)]
Merge "Schematize Crypto state system property"
am:
88b57a2c4d
Change-Id: Idb96ab95b1ea69a636f315edeb84c8ba025d75bd
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
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
Josh Hou [Wed, 13 Mar 2019 04:26:18 +0000 (21:26 -0700)]
Merge "add NonNull annotation to API"
am:
56c9d22970
Change-Id: Iaa22836680e45c4244a4380d9688b968b7877c8e
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
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
Xiangyu/Malcolm Chen [Wed, 13 Mar 2019 04:14:14 +0000 (04:14 +0000)]
Merge "Only 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
TreeHugger Robot [Wed, 13 Mar 2019 04:01:18 +0000 (04:01 +0000)]
Merge "MediaDrm: create Executor overload for callback APIs"
Dieter Hsu [Wed, 13 Mar 2019 03:42:37 +0000 (03:42 +0000)]
Merge "Auto dismiss heads-up notification according to accessibility timeout"
Mathieu Chartier [Wed, 13 Mar 2019 03:23:19 +0000 (03:23 +0000)]
Merge "Call notifyStartupCompleted from reportFullyDrawn"
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."
Hyundo Moon [Wed, 13 Mar 2019 02:59:35 +0000 (02:59 +0000)]
Merge "Allow registering multiple RemoteVolumeController"
TreeHugger Robot [Wed, 13 Mar 2019 02:31:39 +0000 (02:31 +0000)]
Merge "Help on issue #
128350014: runInstallCreate from pm command asks..."
Treehugger Robot [Wed, 13 Mar 2019 02:28:32 +0000 (02:28 +0000)]
Merge "Add @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
Xin Li [Wed, 13 Mar 2019 02:26:04 +0000 (02:26 +0000)]
Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
Chalard Jean [Wed, 13 Mar 2019 02:07:29 +0000 (02:07 +0000)]
Merge "Tell the factory it is already serving a request."
TreeHugger Robot [Wed, 13 Mar 2019 02:02:06 +0000 (02:02 +0000)]
Merge "Add logging for doze trigger reasons."
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
Ian Kasprzak [Wed, 13 Mar 2019 01:52:21 +0000 (01:52 +0000)]
Merge "Temporarily disable flaky test."
Treehugger Robot [Wed, 13 Mar 2019 01:30:58 +0000 (01:30 +0000)]
Merge "Schematize Crypto state system property"
Xiao Ma [Wed, 13 Mar 2019 01:13:08 +0000 (01:13 +0000)]
Merge "[KA13]: add unit test for exposed TCP socket keepalive API."
TreeHugger Robot [Wed, 13 Mar 2019 01:05:39 +0000 (01:05 +0000)]
Merge "Always suppress font error during resource loading"
Josh Hou [Wed, 13 Mar 2019 00:58:21 +0000 (00:58 +0000)]
Merge "add NonNull annotation to API"
TreeHugger Robot [Wed, 13 Mar 2019 00:55:25 +0000 (00:55 +0000)]
Merge "Audio service: restrict conditions to send ACTION_AUDIO_BECOMING_NOISY"
Shafik Nassar [Wed, 13 Mar 2019 00:29:09 +0000 (00:29 +0000)]
Merge "Test staged rollback for apk and apex install"
Lorenzo Colitti [Wed, 13 Mar 2019 00:23:50 +0000 (09:23 +0900)]
Temporarily disable flaky test.
Test: None
Bug:
128426024
Change-Id: Id88bf452f41f512703d5831e357d9ba72dc5b911
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
TreeHugger Robot [Wed, 13 Mar 2019 00:11:57 +0000 (00:11 +0000)]
Merge "Disable any fullScreenIntent launches in SystemUI."
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
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
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
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
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
Will Brockman [Tue, 12 Mar 2019 23:26:47 +0000 (23:26 +0000)]
Merge "Add Tron logging of explanation for notification importance."
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
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
Jiyong Park [Tue, 12 Mar 2019 23:19:31 +0000 (16:19 -0700)]
Merge "Revert^3 "Delay start of bootanimation until after the Runtime APEX is mounted."" am:
1a14dedcce
am:
6623e402b3
Change-Id: Ic58b4c2dee735ff2e07bc1217173c23810c1d14c
Hall Liu [Tue, 12 Mar 2019 23:14:35 +0000 (16:14 -0700)]
[automerger skipped] Merge "Change summary text of Wi-Fi calling" am:
68fdc5b7be am:
281b94320e
am:
89e874ad03 -s ours
am skip reason: change_id I75b970ed2094c4efcb5a8cf8b89cf3d8c78bb5db with SHA1
2950d382f6 is in history
Change-Id: I3265780291f1f31f29b57c778795fcaae2886e65
Nathan Harold [Tue, 12 Mar 2019 23:12:08 +0000 (16:12 -0700)]
Merge "[API Feedback] Rename DebugEventReporter" am:
3a6dcad0a3
am:
e80b170949
Change-Id: I2c458c5a5fa2b1f47f9bc92e89a7385ca35d877d
Xiangyu/Malcolm Chen [Tue, 12 Mar 2019 23:12:05 +0000 (16:12 -0700)]
Merge "Don't return hidden subscription in getActiveSubIdList"
am:
d2cb5a0608
Change-Id: Ie8d0998a15b2fa905ba5073f47badf51afd1154a
Xiangyu/Malcolm Chen [Tue, 12 Mar 2019 22:59:00 +0000 (22:59 +0000)]
Merge "Don't return hidden subscription in getActiveSubIdList"
Android Build Merger (Role) [Tue, 12 Mar 2019 22:58:48 +0000 (22:58 +0000)]
Merge "[automerger skipped] Merge "Add carrier's option to cancel CS reject cause notification" am:
46f5897ae8 am:
58d5921d07 -s ours am:
692616df97 -s ours am skip reason: change_id If4c696e8116094d0cb555fe87c92243af1f34cec with SHA1
93f78f5d81 is in history"
Hans Boehm [Tue, 12 Mar 2019 22:58:32 +0000 (15:58 -0700)]
Merge "Correct registerNativeAllocation type" am:
fe015a098c
am:
90e8135f1e
Change-Id: Ie379dc6782f77e051d7d3eb56ad8661bb3c33ee7
TreeHugger Robot [Tue, 12 Mar 2019 22:57:58 +0000 (22:57 +0000)]
Merge "Camera: Update priority callback documentation"
Jordan Liu [Tue, 12 Mar 2019 22:57:56 +0000 (15:57 -0700)]
[automerger skipped] Merge "Add carrier's option to cancel CS reject cause notification" am:
46f5897ae8 am:
58d5921d07 -s ours
am:
692616df97 -s ours
am skip reason: change_id If4c696e8116094d0cb555fe87c92243af1f34cec with SHA1
93f78f5d81 is in history
Change-Id: I0452cd77773c1ecb898d032a67bc7cb5ed818a80
Xiangyu/Malcolm Chen [Tue, 12 Mar 2019 22:55:53 +0000 (15:55 -0700)]
Merge "Don't return hidden subscription in getActiveSubscriptionInfoList."
am:
8cbe957dba
Change-Id: I372f27a1ee10cd46c5f0633586709ee14cd6e070
Hall Liu [Tue, 12 Mar 2019 22:51:26 +0000 (15:51 -0700)]
Merge "Change summary text of Wi-Fi calling" am:
68fdc5b7be
am:
281b94320e
Change-Id: Idd9ea6149ec9ddd3d122bcb6d4f9192a774f113d
Jiyong Park [Tue, 12 Mar 2019 22:49:30 +0000 (15:49 -0700)]
Merge "Revert^3 "Delay start of bootanimation until after the Runtime APEX is mounted.""
am:
1a14dedcce
Change-Id: Ia70c876b6d95074cc8502b3ff1467cb5dc0d4302
Jordan Liu [Tue, 12 Mar 2019 22:43:42 +0000 (15:43 -0700)]
[automerger skipped] Merge "Add carrier's option to cancel CS reject cause notification" am:
46f5897ae8
am:
58d5921d07 -s ours
am skip reason: SHA1
58d5921d07 skipped by user jminjie
Change-Id: I7fdcc48a5f85c05c6367eef9e47894c7e7ea6531
Xiangyu/Malcolm Chen [Tue, 12 Mar 2019 22:40:39 +0000 (22:40 +0000)]
Merge "Don't return hidden subscription in getActiveSubscriptionInfoList."
TreeHugger Robot [Tue, 12 Mar 2019 22:40:28 +0000 (22:40 +0000)]
Merge "Revert related work of extractNativeLibs default flip"
Nathan Harold [Tue, 12 Mar 2019 22:38:26 +0000 (15:38 -0700)]
Merge "[API Feedback] Rename DebugEventReporter"
am:
3a6dcad0a3
Change-Id: Iab9ed0e8160b45628286f6236f1bb5f61ecc74cd
Treehugger Robot [Tue, 12 Mar 2019 22:34:26 +0000 (22:34 +0000)]
Merge "Revert^3 "Delay start of bootanimation until after the Runtime APEX is mounted.""
Seongho Kim [Tue, 13 Nov 2018 06:08:34 +0000 (15:08 +0900)]
Add carrier's option to cancel CS reject cause notification
Some carrier still want to cancel CS reject notification automatically
when it gets service. So, we need a way to set carrier's option for it.
Bug:
79889307
Test: Manual
Change-Id: If4c696e8116094d0cb555fe87c92243af1f34cec
Merged-In: If4c696e8116094d0cb555fe87c92243af1f34cec
Jiyong Park [Thu, 28 Feb 2019 03:21:16 +0000 (12:21 +0900)]
Revert^3 "Delay start of bootanimation until after the Runtime APEX is mounted."
This reverts commit
a6bb8916b057bb619aab2aae5cb07e190e97c79d.
Bootanim doesn't need to be delayed because the APEXes from the system partition are now
activated very early in the boot sequence (far before bootanim is started).
See https://android-review.googlesource.com/q/topic:%22apex_earlymount_base%22+(status:open%20OR%20status:merged)
Bug:
125549215
Test: bootanim is started without being delayed
Change-Id: I367b1a5c6bf08dad770cd2bf7f6d67dbf1a813e6
Yiwei Zhang [Mon, 11 Mar 2019 22:05:12 +0000 (15:05 -0700)]
Game Driver Metrics: add tests for GpuStatsPuller
Bug:
123529932
Test: atest GpuStatsPuller_test
Change-Id: I325f90d203539b51ee0a9deb2b048b8671e5e89a
Nathan Harold [Tue, 12 Mar 2019 22:25:46 +0000 (22:25 +0000)]
Merge "[API Feedback] Rename DebugEventReporter"
Jordan Liu [Thu, 28 Feb 2019 20:05:53 +0000 (12:05 -0800)]
Add slot based ICC channel APIs
These are SystemApis which require MODIFY_PHONE_STATE, and can be used
to open ICC channels when there is no available subscription, using the
slot index instead of subId.
Bug:
126578014
Test: builds
Change-Id: I3f47a8ac07813ea9e326c7d76123352708bfeea2
Matt Pape [Tue, 12 Mar 2019 21:58:01 +0000 (21:58 +0000)]
Merge "Remove interface for dex_boot."
TreeHugger Robot [Tue, 12 Mar 2019 21:54:07 +0000 (21:54 +0000)]
Merge "Revert "Checkng upper bound in *Array classes.""
OSDN Git Service
