OSDN Git Service
Android Build Merger (Role) [Tue, 13 Mar 2018 20:58:09 +0000 (20:58 +0000)]
Merge changes from topic "am-
ef462d34f9744b85a089fbf25fe15db2" into pi-dev-plus-aosp
* changes:
Merge changes from topic "dnd_touch_sounds" into pi-dev am:
5e9f40a30e
Charging sounds won't play when dnd is on am:
a4539c5cf1
Beverly [Tue, 13 Mar 2018 20:57:20 +0000 (20:57 +0000)]
Merge changes from topic "dnd_touch_sounds" into pi-dev
am:
5e9f40a30e
Change-Id: I4d35bb3dd7f3996739fe781c8f8566865a9ad83d
Beverly [Tue, 13 Mar 2018 20:49:49 +0000 (20:49 +0000)]
Charging sounds won't play when dnd is on
am:
a4539c5cf1
Change-Id: Idc892e33a9a905bd0da7a551ef39334d92910382
Android Build Merger (Role) [Tue, 13 Mar 2018 20:41:41 +0000 (20:41 +0000)]
Merge "Merge "Carrier id api rename" am:
57479b64b7 am:
6b2f7f92b1 -s ours" into pi-dev-plus-aosp
fionaxu [Tue, 13 Mar 2018 20:41:04 +0000 (20:41 +0000)]
Merge "Carrier id api rename" am:
57479b64b7
am:
6b2f7f92b1 -s ours
Change-Id: Ibb053fc766b1d602d33a8b5676b6cd45fc5b7425
Bryce Lee [Tue, 13 Mar 2018 20:40:02 +0000 (20:40 +0000)]
Merge "Ignore activity lifecycle requests without matching client records." into pi-dev
am:
790c5d04c8
Change-Id: I8c8b8799073bc92f0464fa79491db16cc10057ae
Android Build Merger (Role) [Tue, 13 Mar 2018 20:25:55 +0000 (20:25 +0000)]
Merge "Merge "Allow for activities to resumed if keyguard is occluded." into pi-dev am:
fe478ff7ba" into pi-dev-plus-aosp
Bryce Lee [Tue, 13 Mar 2018 20:25:23 +0000 (20:25 +0000)]
Merge "Allow for activities to resumed if keyguard is occluded." into pi-dev
am:
fe478ff7ba
Change-Id: I104e1763ae52ac6093bf82532b2091b81da5b716
fionaxu [Tue, 13 Mar 2018 20:24:49 +0000 (20:24 +0000)]
Merge "Carrier id api rename"
am:
57479b64b7
Change-Id: I44bd557cd89db9152c1bd66c8ee02b7ab45ec989
Ruchi Kandoi [Tue, 13 Mar 2018 20:24:39 +0000 (20:24 +0000)]
Merge "Remove the UICC specific code from android.se.omapi" am:
56be32e1ce
am:
5800d2b299
Change-Id: Ie62f1adc711c88f6d9ee23503c36ad09b35bbd5e
Ruchi Kandoi [Tue, 13 Mar 2018 20:08:36 +0000 (20:08 +0000)]
Merge "Remove the UICC specific code from android.se.omapi"
am:
56be32e1ce
Change-Id: I458cfa98edde0176f84d858fb55e110647f06774
TreeHugger Robot [Tue, 13 Mar 2018 19:58:51 +0000 (19:58 +0000)]
Merge changes from topic "dnd_touch_sounds" into pi-dev
* changes:
DND touch sounds toggle does not toggle vibrations
Charging sounds won't play when dnd is on
Michael Wright [Tue, 13 Mar 2018 19:55:56 +0000 (19:55 +0000)]
Merge "Expose the new brightness permissions as test APIs." into pi-dev
am:
3ed6c6330a
Change-Id: I11457ba1b8cfb068da6b7b0df29571dd5522fee3
yinxu [Tue, 13 Mar 2018 19:47:30 +0000 (19:47 +0000)]
Merge "Catch the RuntimeException for stopScan()" into pi-dev
am:
ed9ee780a4
Change-Id: I6815cbc5e896d6e24ea3abc5a258e8e6ecac0135
Bryce Lee [Tue, 13 Mar 2018 19:46:03 +0000 (19:46 +0000)]
Merge "Ignore activity lifecycle requests without matching client records." into pi-dev
Seigo Nonaka [Tue, 13 Mar 2018 19:42:51 +0000 (19:42 +0000)]
Merge "Add selectable text view perf test for random text" into pi-dev
am:
f2939ab2da
Change-Id: I3ce6424fd960b3a7146734ec63d6e328a7729a55
yinxu [Tue, 13 Mar 2018 19:38:10 +0000 (19:38 +0000)]
Merge "Fix a bug when calling onError(int)" into pi-dev
am:
f7e6b29718
Change-Id: I51b497c085a7e3ef16b77d1039459b04c28d8f7d
TreeHugger Robot [Tue, 13 Mar 2018 19:37:25 +0000 (19:37 +0000)]
Merge "Allow for activities to resumed if keyguard is occluded." into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 19:20:47 +0000 (19:20 +0000)]
Merge "Expose the new brightness permissions as test APIs." into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 19:18:42 +0000 (19:18 +0000)]
Merge "Catch the RuntimeException for stopScan()" into pi-dev
Felipe Leme [Tue, 13 Mar 2018 19:17:47 +0000 (19:17 +0000)]
Merge "Fixed flags when button that trigger autofill is clicked." into pi-dev
am:
a56e4bbad0
Change-Id: Ia97e42c8444a2c8a726dc3052fa7307f2e93cb49
Lucas Dupin [Tue, 13 Mar 2018 19:01:44 +0000 (19:01 +0000)]
Merge "Show scrims when bouncer is on top of QS" into pi-dev
am:
fa9eef6459
Change-Id: Id8a9f2582d8a4142c44c5813b8b8ff1138072fe1
TreeHugger Robot [Tue, 13 Mar 2018 19:01:40 +0000 (19:01 +0000)]
Merge "Add selectable text view perf test for random text" into pi-dev
Julia Reynolds [Tue, 13 Mar 2018 18:53:54 +0000 (18:53 +0000)]
Merge "metrics for 'manage notifications' affordance." into pi-dev
am:
bf4f1795ec
Change-Id: Ic5adbec728bb4ce7d33db2725b51b371cc405eb0
TreeHugger Robot [Tue, 13 Mar 2018 18:47:28 +0000 (18:47 +0000)]
Merge "Fix a bug when calling onError(int)" into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 18:45:47 +0000 (18:45 +0000)]
Merge "Fixed flags when button that trigger autofill is clicked." into pi-dev
Matthew Ng [Tue, 13 Mar 2018 18:43:54 +0000 (18:43 +0000)]
Merge "Moved VibrateHelper as a dependency" into pi-dev
am:
f32d531a5c
Change-Id: Ia4e3433c4a6a4294ab19410b46cf1e2727caf7a5
Treehugger Robot [Tue, 13 Mar 2018 18:28:50 +0000 (18:28 +0000)]
Merge "Carrier id api rename"
Android Build Merger (Role) [Tue, 13 Mar 2018 18:27:11 +0000 (18:27 +0000)]
Merge "Merge "Remove unneeded notify AIDL API" am:
991f8b0c34 am:
b54c058bb6" into pi-dev-plus-aosp
Brad Ebinger [Tue, 13 Mar 2018 18:26:17 +0000 (18:26 +0000)]
Merge "Remove unneeded notify AIDL API" am:
991f8b0c34
am:
b54c058bb6
Change-Id: I4762bdef59a8adec8ce41972489c65f2d180a3d4
Lucas Dupin [Tue, 13 Mar 2018 18:26:07 +0000 (18:26 +0000)]
Merge "Show scrims when bouncer is on top of QS" into pi-dev
Adrian Roos [Tue, 13 Mar 2018 18:23:12 +0000 (18:23 +0000)]
Merge "Cutout: Add a multi cutout overlay" into pi-dev
am:
2f848a1381
Change-Id: I34f03ed11c58c2286db7eae18e199e9d23ae7b02
TreeHugger Robot [Tue, 13 Mar 2018 18:21:46 +0000 (18:21 +0000)]
Merge "metrics for 'manage notifications' affordance." into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 18:16:37 +0000 (18:16 +0000)]
Merge "Moved VibrateHelper as a dependency" into pi-dev
Matthew Ng [Fri, 9 Mar 2018 21:42:18 +0000 (13:42 -0800)]
Moved VibrateHelper as a dependency
VibrateHelper is a dependency to minimize number of event listeners.
This is related to the change ag/
3711731.
Bug:
73942704
Test: manual, press home button when quick step is enabled
Change-Id: Ic982cd16d88224003aa53847daaa04372898ef22
Android Build Merger (Role) [Tue, 13 Mar 2018 18:11:50 +0000 (18:11 +0000)]
Merge "Merge "Remove IMS Emergency Calling availability API" am:
4b10333c26 am:
56b387aaf1" into pi-dev-plus-aosp
Etan Cohen [Tue, 13 Mar 2018 18:10:22 +0000 (18:10 +0000)]
Merge "[RTT] Update LCI/LCR documentation to refect to IEEE 802.11-2016 spec." into pi-dev
am:
459f913c54
Change-Id: Id198b7d66ce8f86e7b79c306a96f4aebd3e6b3ad
Brad Ebinger [Tue, 13 Mar 2018 18:10:13 +0000 (18:10 +0000)]
Merge "Remove IMS Emergency Calling availability API" am:
4b10333c26
am:
56b387aaf1
Change-Id: I6b8ba0608c540113ce7303907ec632989c6422bc
Brad Ebinger [Tue, 13 Mar 2018 18:04:23 +0000 (18:04 +0000)]
Merge "Remove unneeded notify AIDL API"
am:
991f8b0c34
Change-Id: Ibef00fa1b9d1f4c964798c66af86059d73e2e707
TreeHugger Robot [Tue, 13 Mar 2018 18:00:07 +0000 (18:00 +0000)]
Merge "Cutout: Add a multi cutout overlay" into pi-dev
David Brazdil [Tue, 13 Mar 2018 17:57:35 +0000 (17:57 +0000)]
Merge "Add PrintSpooler to system app whitelist" am:
e6456d160c
am:
676cf1c11a -s ours
Change-Id: I8adc60fd0d808eccd1725dcdc7cf7702d33f2494
Ruchi Kandoi [Tue, 13 Mar 2018 17:56:26 +0000 (17:56 +0000)]
Merge "Remove the UICC specific code from android.se.omapi"
Brad Ebinger [Tue, 13 Mar 2018 17:53:51 +0000 (17:53 +0000)]
Merge "Remove IMS Emergency Calling availability API"
am:
4b10333c26
Change-Id: I8d7bb0eb603c0b7385421bd5b553273424373867
TreeHugger Robot [Tue, 13 Mar 2018 17:50:46 +0000 (17:50 +0000)]
Merge "[RTT] Update LCI/LCR documentation to refect to IEEE 802.11-2016 spec." into pi-dev
David Brazdil [Tue, 13 Mar 2018 17:46:33 +0000 (17:46 +0000)]
Merge "Add PrintSpooler to system app whitelist"
am:
e6456d160c
Change-Id: I991aef25ccb7eb8c3975f5bb2b44f17e430b761a
Amin Shaikh [Tue, 13 Mar 2018 17:34:02 +0000 (17:34 +0000)]
Merge "Show the H+ icon in HSPA+ network" into pi-dev
am:
b90670cf17
Change-Id: I17da2913c86c6a489ee2d31785a7518346710e14
Sundeep Ghuman [Tue, 13 Mar 2018 17:22:50 +0000 (17:22 +0000)]
Merge "Add tests to prevent NPE regression." into pi-dev
am:
4c6130ddcc
Change-Id: I5693435ef084cf66175e666aef27dcc292717dd3
TreeHugger Robot [Tue, 13 Mar 2018 17:12:37 +0000 (17:12 +0000)]
Merge "Show the H+ icon in HSPA+ network" into pi-dev
Bryce Lee [Tue, 13 Mar 2018 17:06:21 +0000 (10:06 -0700)]
Allow for activities to resumed if keyguard is occluded.
A previous changelist enforced that activities would not be resumed
if the keyguard is locked. However, this prevents activities that
show above the keyguard from resuming.
This changelist adjusts this check to account for occlusion.
Fixes:
74585178
Test: Lock screen, fingerprint unlock, verify activity is resumed.
Test: Set alarm, lock screen, verify alarm shows above lock screen
resumed.
Change-Id: I9d26d6b667bb1679c373f36188a610a66d2f5b2d
TreeHugger Robot [Tue, 13 Mar 2018 16:59:52 +0000 (16:59 +0000)]
Merge "Add tests to prevent NPE regression." into pi-dev
Brad Ebinger [Tue, 13 Mar 2018 16:31:35 +0000 (16:31 +0000)]
Merge "Remove unneeded notify AIDL API"
Brad Ebinger [Tue, 13 Mar 2018 16:30:45 +0000 (16:30 +0000)]
Merge "Remove IMS Emergency Calling availability API"
dalyk [Tue, 13 Mar 2018 16:12:25 +0000 (16:12 +0000)]
Merge "Add new netd event callback for changes to private DNS validation state." into pi-dev
am:
fd36a5ddea -s ours
Change-Id: If4aa6719dbd83a6ce3c2a274e894dd97536c5419
David Brazdil [Tue, 13 Mar 2018 16:07:40 +0000 (16:07 +0000)]
Merge "Add PrintSpooler to system app whitelist"
Jorim Jaggi [Tue, 13 Mar 2018 16:04:52 +0000 (16:04 +0000)]
Merge "Improve animation dump/logging" into pi-dev
am:
bc57bf307c
Change-Id: I5ec242fbfeb9ea6ae0be7d744c9ec54ea0e10ec8
Jorim Jaggi [Tue, 13 Mar 2018 15:56:52 +0000 (15:56 +0000)]
Merge "Fix SafeActivityOptions construction in startActivityFromRecents" into pi-dev
am:
0ee147406d
Change-Id: Ie005cb0fadc33748cd3e0930be2d45af25200afa
TreeHugger Robot [Tue, 13 Mar 2018 15:49:47 +0000 (15:49 +0000)]
Merge "Add new netd event callback for changes to private DNS validation state." into pi-dev
Jorim Jaggi [Tue, 13 Mar 2018 15:35:51 +0000 (15:35 +0000)]
Merge "Improve animation dump/logging" into pi-dev
Jorim Jaggi [Tue, 13 Mar 2018 15:34:52 +0000 (15:34 +0000)]
Merge "Fix SafeActivityOptions construction in startActivityFromRecents" into pi-dev
Julia Reynolds [Tue, 13 Mar 2018 14:58:43 +0000 (10:58 -0400)]
metrics for 'manage notifications' affordance.
Bug:
74075050
Test: make
Change-Id: Ic6f65338ca114385890ab3bfac801cc206e4ed6e
Bryce Lee [Fri, 9 Mar 2018 19:02:10 +0000 (11:02 -0800)]
Ignore activity lifecycle requests without matching client records.
Previously, changes were made to finish destroyed activities. This
prevented the code sending lifecycle requests to a non-existent
client record. However, there are scenarios where an activity can
be destroyed without being finished. Finishing these activities will
lead to side effects, such as the activity not being in history and
therefore not restored when navigated back to.
This changelist unlinks finishing from setting an activity's state to
destroyed. For now, we will suppress lifecycle requests client side
without matching records.
Fixes:
74403650
Fixes:
74409828
Bug:
71506345
Test: enable don't keep activities. navigate back and forth
Test: atest CtsActivityManagerDeviceTestCases:ActivityLifecycleTests#testRestoreFromKill
Test: atest CtsActivityManagerDeviceTestCases:ActivityLifecycleTests#testPausedWhenRecreatedFromInNonFocusedStack
Change-Id: I1b76a4758c3be27dc30ecac5ee56949a5b173754
Bernardo Rufino [Tue, 13 Mar 2018 14:35:00 +0000 (14:35 +0000)]
Merge "Add tests for TransportStats and some refactor" into pi-dev
am:
5dbde05f06
Change-Id: Ic8b377e659ffda4927b002064982213ca5d7c1c8
Etan Cohen [Tue, 27 Feb 2018 22:09:39 +0000 (14:09 -0800)]
[RTT] Update LCI/LCR documentation to refect to IEEE 802.11-2016 spec.
Update API doc.
Bug:
73953299
Test: builds
Change-Id: I608f1bc631902baf76d9e21a6dd586b188fdfac1
TreeHugger Robot [Tue, 13 Mar 2018 14:18:30 +0000 (14:18 +0000)]
Merge "Add tests for TransportStats and some refactor" into pi-dev
Jason Monk [Tue, 13 Mar 2018 14:05:56 +0000 (14:05 +0000)]
Merge "Run slice callbacks on thread they come in on" into pi-dev
am:
a033fa7fdc
Change-Id: Ibb4ff6fc540f50e585ed0dcbb5e7eb25a472ce69
TreeHugger Robot [Tue, 13 Mar 2018 13:54:18 +0000 (13:54 +0000)]
Merge "Run slice callbacks on thread they come in on" into pi-dev
dalyk [Thu, 8 Mar 2018 21:25:48 +0000 (16:25 -0500)]
Add new netd event callback for changes to private DNS validation state.
Test: None.
Bug:
71828272
Merged-In: Ib6824606b95deb23da2edd7aa4b96a0de66b12d1
Merged-In: Id88a4e846ae50536ac7b1541cf10c1fad1b1eeca
Change-Id: Ibf2683b9ff7c6cb69d7f4ad12b8bdff7cf7008f0
(cherry picked from commit
99c5029b91f17c46acd219a317b48b3ac0fe9a90)
Adrian Roos [Tue, 13 Mar 2018 13:39:07 +0000 (13:39 +0000)]
Merge changes Iff142ccd,I724080ed into pi-dev
am:
7844159deb
Change-Id: Ia02e8c988b97023079c3bfac57da338b64d3dd37
Jorim Jaggi [Fri, 9 Mar 2018 17:14:48 +0000 (18:14 +0100)]
Fix SafeActivityOptions construction in startActivityFromRecents
Otherwise we'll check the wrong permissions and try to boost
the wrong process.
Test: Open app from recents, make sure Launcher gets scheduled
as needed.
Bug:
73555925
Change-Id: I2d1a7d0c881c0182127a5b25dce0ab1a308d5e63
Erik Kline [Tue, 13 Mar 2018 13:23:08 +0000 (13:23 +0000)]
Merge "Add new netd event callback for changes to private DNS validation state." am:
40ca5a06bf
am:
5e9725bdc7
Change-Id: Ib6824606b95deb23da2edd7aa4b96a0de66b12d1
Adrian Roos [Tue, 13 Mar 2018 13:21:17 +0000 (13:21 +0000)]
Merge changes Iff142ccd,I724080ed into pi-dev
* changes:
Multi cutout: Fix IME navigation guard
Multi Cutout: Fix more cutout issues
Erik Kline [Tue, 13 Mar 2018 13:11:37 +0000 (13:11 +0000)]
Merge "Add new netd event callback for changes to private DNS validation state."
am:
40ca5a06bf
Change-Id: I504148b6a508b6f5e4b5dfa0976362496b91c15c
Jorim Jaggi [Tue, 27 Feb 2018 14:05:21 +0000 (15:05 +0100)]
Improve animation dump/logging
Bug:
74220420
Test: go/wm-smoke
Test: adb shell dumpsys window during animation
Change-Id: Ib8bddb4f38ad4fe7a80315d3bfdac0a80aea4cc8
Julia Reynolds [Tue, 13 Mar 2018 12:42:11 +0000 (12:42 +0000)]
Merge "Volume UI updates" into pi-dev
am:
89c4bd5f26
Change-Id: Idcc2eb1c020b86a13de4948215b4a8311ea7fff4
Hyundo Moon [Tue, 13 Mar 2018 12:26:01 +0000 (12:26 +0000)]
Merge "MediaSession2: Replace PlaybackState2" into pi-dev
am:
15d3ba624c
Change-Id: I184df5f20021ae602fae9411663c97185c1329e5
TreeHugger Robot [Tue, 13 Mar 2018 12:17:30 +0000 (12:17 +0000)]
Merge "Volume UI updates" into pi-dev
Hyundo Moon [Tue, 13 Mar 2018 12:03:55 +0000 (12:03 +0000)]
Merge "MediaSession2: Replace PlaybackState2" into pi-dev
Erik Kline [Tue, 13 Mar 2018 11:58:19 +0000 (11:58 +0000)]
Merge "Add new netd event callback for changes to private DNS validation state."
Christofer Åkersten [Tue, 13 Mar 2018 11:16:50 +0000 (11:16 +0000)]
Merge "Ensure members are non-null in callback" into pi-dev
am:
f0927b0726
Change-Id: I15359e1ee1f5e79d29bd4408f8eb56dcf93cfd39
Leon Scroggins [Tue, 13 Mar 2018 11:00:26 +0000 (11:00 +0000)]
Merge "Encode F16 Bitmaps to 8-bit P3" into pi-dev
am:
5a0b48a13d
Change-Id: Iea3b44fcb680f1632d02595886d18145d61cf0f4
TreeHugger Robot [Tue, 13 Mar 2018 11:00:25 +0000 (11:00 +0000)]
Merge "Ensure members are non-null in callback" into pi-dev
Tony Mak [Tue, 13 Mar 2018 10:46:04 +0000 (10:46 +0000)]
Merge "Use the correct drawable to badge user icon" into pi-dev
am:
fd95ca6d2e
Change-Id: Ibd02faa61bd0e94039443d6242a706e4ed5b46b6
Leon Scroggins [Tue, 13 Mar 2018 10:40:25 +0000 (10:40 +0000)]
Merge "Encode F16 Bitmaps to 8-bit P3" into pi-dev
Tej Singh [Tue, 13 Mar 2018 10:37:43 +0000 (10:37 +0000)]
Merge "Atoms: Bluetooth" into pi-dev
am:
c154be5591
Change-Id: Ia6ca344d94ae67655116f219d5cda0f2d0a16354
TreeHugger Robot [Tue, 13 Mar 2018 10:24:15 +0000 (10:24 +0000)]
Merge "Use the correct drawable to badge user icon" into pi-dev
TreeHugger Robot [Tue, 13 Mar 2018 10:22:28 +0000 (10:22 +0000)]
Merge "Atoms: Bluetooth" into pi-dev
Hyundo Moon [Wed, 7 Mar 2018 01:22:45 +0000 (10:22 +0900)]
MediaSession2: Replace PlaybackState2
This CL removes PlaybackState2 and replaces it with other APIs.
Bug:
74370608, Bug:
73971431
Test: Passed CTS
Change-Id: Ifa16b1d551957ab4bb06979ddf29b18772093035
Lucas Dupin [Mon, 12 Mar 2018 18:39:29 +0000 (11:39 -0700)]
Show scrims when bouncer is on top of QS
Test: visual
Change-Id: I09c37c8478e1c409854af837cabf7bb12c5de79b
Fixes:
74511816
Christofer Åkersten [Tue, 13 Mar 2018 04:30:06 +0000 (13:30 +0900)]
Ensure members are non-null in callback
Bug:
74570008
Test: runtest-cts-MediaComponents -r 100
Change-Id: I59590afae4e67fa8a90f8a7b4a6be58ce54e2806
Jovana Knezevic [Tue, 13 Mar 2018 05:42:40 +0000 (05:42 +0000)]
Merge "Removing the countdown timer and countdown progress bar from the Car User Picker." into pi-dev
am:
660a7639ca
Change-Id: I31f7ca3cdb55196df319e0e3aff9f348d7246e22
Jovana Knezevic [Tue, 13 Mar 2018 05:26:21 +0000 (05:26 +0000)]
Merge "Removing the countdown timer and countdown progress bar from the Car User Picker." into pi-dev
Jaewan Kim [Tue, 13 Mar 2018 05:19:26 +0000 (05:19 +0000)]
Merge changes from topics "session2_additem", "session2_playlistmetadata", "session2_getplaylist" into pi-dev
am:
c3efa17bdd
Change-Id: Ief5747c903ef745dc29142d3543e95945a8fcccd
Jaewan Kim [Tue, 13 Mar 2018 05:12:26 +0000 (05:12 +0000)]
MediaSession2: Implement update/getPlaylistMetadata()
am:
dc5ab8095a
Change-Id: I5cb92995715ec305cbc54b1985505889187eed18
Jaewan Kim [Tue, 13 Mar 2018 05:05:29 +0000 (05:05 +0000)]
MediaSession2: Implement get/setPlaylist()
am:
25db3cdb93
Change-Id: I64674815c02077f90a406657b4cf17199bbfa8e8
Robert Carr [Tue, 13 Mar 2018 04:46:17 +0000 (04:46 +0000)]
Merge "WindowState: Update mLastSurfaceInsets at creation time." into pi-dev
am:
9f0111c82a
Change-Id: I5d9d868ac6d1089f8442ddda04291d786cd1f83d
fionaxu [Thu, 8 Mar 2018 05:52:05 +0000 (21:52 -0800)]
Carrier id api rename
Rename getAndroidCarrierIdForSubscription to getSimCarrierId.
Drop prefix "Android" as Android is implicit everywhere.
Rename carrierName to CarrierIdName to imply correlation between
these two APIs. This also helps to differentiate from another API
getSimOperatorName.
Bug:
71584605
Test: build
Change-Id: Iba4b1c21522741b8c11836a4c39004064736b4c6
(cherry picked from commit
c8d483e488b8fb75e997a4a48c632e20cae0f4b7)
Merged-in: Iba4b1c21522741b8c11836a4c39004064736b4c6
Jiyong Park [Tue, 13 Mar 2018 04:39:10 +0000 (04:39 +0000)]
Merge "Limit the systemconfig tags allowed to vendors" into pi-dev
am:
75029d0dbc
Change-Id: I83a2ce726c90865405099e3ecfbc2df9efede12e
Jaewan Kim [Tue, 13 Mar 2018 04:30:50 +0000 (04:30 +0000)]
Merge changes from topics "session2_additem", "session2_playlistmetadata", "session2_getplaylist" into pi-dev
* changes:
MediaSession2: Implement add/remove/replacePlaylistItem()
MediaSession2: Implement update/getPlaylistMetadata()
MediaSession2: Implement get/setPlaylist()
Kevin Chyn [Tue, 13 Mar 2018 04:28:54 +0000 (04:28 +0000)]
Merge "Update FingerprintDialog UI for landscape orientation" into pi-dev
am:
3690effd2d
Change-Id: I6ce3cccf88532cb473c65fa43c75fde7734616fe
TreeHugger Robot [Tue, 13 Mar 2018 04:09:33 +0000 (04:09 +0000)]
Merge "WindowState: Update mLastSurfaceInsets at creation time." into pi-dev
OSDN Git Service
