OSDN Git Service
Jack Yu [Fri, 16 Mar 2018 20:37:22 +0000 (20:37 +0000)]
Merge "Added CTS test cases for getNetworkId() and getSystemId()" am:
a9c0419010
am:
bd95fa3c21 -s ours
Change-Id: If3965ae16a7fa34e5011eca05560704fd86507e6
yinxu [Fri, 16 Mar 2018 19:52:11 +0000 (19:52 +0000)]
Merge "Use AsyncTask.SERIAL_EXECUTOR as the default executor for scan" am:
cdbf930883
am:
a93e4124b5
Change-Id: I0f67a737f418d105658763e21974dc60216aee1a
Bryce Lee [Fri, 16 Mar 2018 19:47:49 +0000 (19:47 +0000)]
Merge "Do not sleep activities in focused stack when keyguard is going away" into pi-dev
am:
3912a7f544
Change-Id: I7d547cf1ca947f83357ac0d8c7cc773d5a9b8662
Anthony Stange [Fri, 16 Mar 2018 19:40:08 +0000 (19:40 +0000)]
Merge "Add scan background mode to Settings.Global." am:
3aa064897e
am:
4061a9f348
Change-Id: Iac4d39cc4fcf0f0c8273cee7fbe9822251764068
Jack Yu [Fri, 16 Mar 2018 19:36:31 +0000 (19:36 +0000)]
Merge "Added CTS test cases for getNetworkId() and getSystemId()"
am:
a9c0419010
Change-Id: I6bc4d056458e7c57729c0b37b7867ad08fe8d637
yinxu [Fri, 16 Mar 2018 19:31:26 +0000 (19:31 +0000)]
Merge "Use AsyncTask.SERIAL_EXECUTOR as the default executor for scan"
am:
cdbf930883
Change-Id: Icd89a86250d28c271f0a3ba2dc1553b313ace646
Anthony Stange [Fri, 16 Mar 2018 19:29:03 +0000 (19:29 +0000)]
Merge "Add scan background mode to Settings.Global."
am:
3aa064897e
Change-Id: I2993a751fbf17b561f770307f199ab1c1d4469b8
Oscar Shu [Fri, 16 Mar 2018 19:24:34 +0000 (19:24 +0000)]
Merge "Deleting Visibility from WifiConfiguration" into pi-dev
am:
6604af68c5
Change-Id: Ic68d76399aca1a5ca1a248c38ac8aba3be63fbf1
Bryce Lee [Fri, 16 Mar 2018 19:11:56 +0000 (19:11 +0000)]
Merge "Do not sleep activities in focused stack when keyguard is going away" into pi-dev
Yi Jin [Fri, 16 Mar 2018 18:49:15 +0000 (18:49 +0000)]
Merge "Fix privacy tags based on PWG review meeting." into pi-dev
am:
7d17dd7184
Change-Id: Iedbd95f7a0c4cc0a42e5ebc38e79d684657c708d
Oscar Shu [Fri, 16 Mar 2018 18:45:27 +0000 (18:45 +0000)]
Merge "Deleting Visibility from WifiConfiguration" into pi-dev
Bryce Lee [Fri, 16 Mar 2018 18:42:34 +0000 (18:42 +0000)]
Merge "Clear calling UID before resolving intent types." into pi-dev
am:
c16de0565b
Change-Id: Idf837123922d43c612d24eadc08cfaa7a307e408
Yi Jin [Fri, 16 Mar 2018 18:18:11 +0000 (18:18 +0000)]
Merge "Fix privacy tags based on PWG review meeting." into pi-dev
Jack Yu [Fri, 16 Mar 2018 18:17:39 +0000 (18:17 +0000)]
Merge "Renamed getNetworkId and getSystemId" into pi-dev
am:
6b4e6a17e9
Change-Id: I6abe048410da981bd0adfe9919ad4e7ea734b0c6
Bryce Lee [Fri, 16 Mar 2018 18:04:00 +0000 (18:04 +0000)]
Merge "Clear calling UID before resolving intent types." into pi-dev
Dake Gu [Fri, 16 Mar 2018 17:49:52 +0000 (17:49 +0000)]
Merge "autofill: ViewRootImpl.dispatchKeyFromIme() should not be dropped" into pi-dev
am:
21935e0c6f
Change-Id: Ifceea4563157f208627e289e3c3eb800aac7d522
Jack Yu [Fri, 16 Mar 2018 17:39:54 +0000 (17:39 +0000)]
Merge "Renamed getNetworkId and getSystemId" into pi-dev
Treehugger Robot [Fri, 16 Mar 2018 17:39:38 +0000 (17:39 +0000)]
Merge "Added CTS test cases for getNetworkId() and getSystemId()"
Dake Gu [Fri, 16 Mar 2018 17:32:25 +0000 (17:32 +0000)]
Merge "autofill: ViewRootImpl.dispatchKeyFromIme() should not be dropped" into pi-dev
Treehugger Robot [Fri, 16 Mar 2018 17:23:53 +0000 (17:23 +0000)]
Merge "Use AsyncTask.SERIAL_EXECUTOR as the default executor for scan"
Philip P. Moltmann [Fri, 16 Mar 2018 16:31:19 +0000 (16:31 +0000)]
Merge "onUnsyncableAccount: Better docs, main thread" into pi-dev
am:
ddbb9d00a2
Change-Id: Ic1e4f9a8d7b978c58c42b818c3022f3749a4785e
Treehugger Robot [Fri, 16 Mar 2018 16:15:50 +0000 (16:15 +0000)]
Merge "Add scan background mode to Settings.Global."
Seigo Nonaka [Fri, 16 Mar 2018 16:10:55 +0000 (16:10 +0000)]
Merge "Make PrecomputedText Spannable for supporting selection" into pi-dev
am:
71ed54f377
Change-Id: I9f755b9ba3b5b4b909f57708bb7bdcec349e0724
Anthony Stange [Wed, 14 Mar 2018 01:09:45 +0000 (01:09 +0000)]
Add scan background mode to Settings.Global.
This enables us to mess with the different scan intervals and shift
clients to a different scan mode in the background based on what scan
interval values we choose for the different power modes.
Bug:
71765044
Test: None. Just adding a key.
Change-Id: Id48ebc521dd3fe8a68c9c4c0bdb1018ea5b3743e
Philip P. Moltmann [Fri, 16 Mar 2018 16:04:08 +0000 (16:04 +0000)]
Merge "onUnsyncableAccount: Better docs, main thread" into pi-dev
TreeHugger Robot [Fri, 16 Mar 2018 15:43:46 +0000 (15:43 +0000)]
Merge "Make PrecomputedText Spannable for supporting selection" into pi-dev
Jorim Jaggi [Fri, 16 Mar 2018 15:02:47 +0000 (15:02 +0000)]
Merge "Fix stuck exiting windows" into pi-dev
am:
65e2dda7f8
Change-Id: I95646a8488a7b08d79275b611196bafddd77fddb
Adrian Roos [Fri, 16 Mar 2018 14:49:36 +0000 (14:49 +0000)]
Merge "DisplayCutout: Fix corner cutout issues in SystemUI" into pi-dev
am:
be6007f0e0
Change-Id: I06dc817e07a8a6c2487fbaf59646d9016bd21b0d
Adam Newman [Fri, 16 Mar 2018 14:41:42 +0000 (14:41 +0000)]
Merge "Enable optional divider in AccessPointPreference" into pi-dev
am:
6ecff890e3
Change-Id: I9c071dd0c8c48df7f0989cb31177968f9f95e5f4
Jorim Jaggi [Fri, 16 Mar 2018 14:35:01 +0000 (14:35 +0000)]
Merge "Fix stuck exiting windows" into pi-dev
Adrian Roos [Fri, 16 Mar 2018 14:27:30 +0000 (14:27 +0000)]
Merge "DisplayCutout: Fix corner cutout issues in SystemUI" into pi-dev
Adam Newman [Fri, 16 Mar 2018 14:26:25 +0000 (14:26 +0000)]
Merge "Enable optional divider in AccessPointPreference" into pi-dev
Alan Viverette [Fri, 16 Mar 2018 14:06:04 +0000 (14:06 +0000)]
Merge "Restore "Update packages for 1.0.0-beta1"" into pi-dev
am:
259dd151f4
Change-Id: Ic2ac3ecafbfa6ff29580c86f7a639783b94f21dc
Alan Viverette [Fri, 16 Mar 2018 13:53:46 +0000 (13:53 +0000)]
Merge "Restore "Update packages for 1.0.0-beta1"" into pi-dev
Adrian Roos [Fri, 16 Mar 2018 13:12:20 +0000 (13:12 +0000)]
Merge "DisplayCutout: Add corner cutout overlay" into pi-dev
am:
e90248c00e
Change-Id: I9aac0a0298107e727a0a0f044692d15632e691d4
Adrian Roos [Fri, 16 Mar 2018 13:01:00 +0000 (13:01 +0000)]
Merge "DisplayCutout: Add corner cutout overlay" into pi-dev
David Brazdil [Fri, 16 Mar 2018 12:55:35 +0000 (12:55 +0000)]
Merge "Add uses of hidden APIs from vendor apps" into pi-dev
am:
54503fbeed
Change-Id: I0b4e41116ec8030cd435d620309283aa15d5f94a
TreeHugger Robot [Fri, 16 Mar 2018 12:45:47 +0000 (12:45 +0000)]
Merge "Add uses of hidden APIs from vendor apps" into pi-dev
Jorim Jaggi [Fri, 16 Mar 2018 12:29:56 +0000 (12:29 +0000)]
Merge "Boost thread priorities when running recents anim" into pi-dev
am:
93c2359507
Change-Id: I76432af081b9685d680e2a28ae745e2c575d2af0
Jorim Jaggi [Fri, 16 Mar 2018 12:14:48 +0000 (12:14 +0000)]
Merge "Boost thread priorities when running recents anim" into pi-dev
Annie Meng [Fri, 16 Mar 2018 10:37:19 +0000 (10:37 +0000)]
Merge "DO NOT MERGE Create a setting for backup/restore agent timeouts" into pi-dev
am:
ec243338ea
Change-Id: I229ad0b8545f7aa2d4cfabf72cf39b90ec6e000d
Annie Meng [Fri, 16 Mar 2018 10:25:32 +0000 (10:25 +0000)]
Merge "DO NOT MERGE Create a setting for backup/restore agent timeouts" into pi-dev
David Brazdil [Tue, 13 Mar 2018 09:41:23 +0000 (09:41 +0000)]
Add uses of hidden APIs from vendor apps
These will move into the dark greylist once we remove the UI toast.
Merge them with light greylist for now.
Bug:
64382372
Bug:
74589747
Bug:
74588266
Bug:
74586173
Bug:
74586969
Test: make
Change-Id: I8c1d3b67b763e8b14a66874705ba7165cf421e72
Merged-In: I5d0ec308a0187d67df6d9a4f0778c9285dc1e2af
Hyundo Moon [Fri, 16 Mar 2018 09:47:42 +0000 (09:47 +0000)]
MediaSession2: Implement getPlayerState/Position/BufferedPosition
am:
78e4f84f04
Change-Id: I58c1d7c12900ed0542db9a930ecd8be1461a99eb
Hyundo Moon [Thu, 15 Mar 2018 05:00:07 +0000 (14:00 +0900)]
MediaSession2: Implement getPlayerState/Position/BufferedPosition
Bug:
74578458
Test: Passed CTS
Change-Id: If215e8e16bdce9fdc04ca18ed8d08ed374d13a98
Jack Yu [Fri, 23 Feb 2018 01:37:38 +0000 (17:37 -0800)]
Added CTS test cases for getNetworkId() and getSystemId()
Bug:
32718590
Test: atest CtsTelephonyTestCases:ServiceStateTest#testServiceState
Merged-In: I5826a59d85028f0350ee39c69553f4e488d6456b
Change-Id: I5826a59d85028f0350ee39c69553f4e488d6456b
(cherry picked from commit
1b8b38928b4e20e7e66ab75e39159b158dc5c4c9)
Jaewan Kim [Fri, 16 Mar 2018 06:50:42 +0000 (06:50 +0000)]
Merge "MediaSession2: Implement PlaylistParams replacements" into pi-dev
am:
328df91d99
Change-Id: Ia718e5c82ac4a055bb3314d716cc910648c75fff
Jaewan Kim [Fri, 16 Mar 2018 06:35:23 +0000 (06:35 +0000)]
Merge "MediaSession2: Implement PlaylistParams replacements" into pi-dev
Andreas Gampe [Fri, 16 Mar 2018 05:03:09 +0000 (05:03 +0000)]
Merge "Frameworks: Fix system server profiling" into pi-dev
am:
a2d0f2f335 -s ours
Change-Id: I17c36c63528d2ff04875f6a69ce86f982ebb2400
Yohei Yukawa [Fri, 16 Mar 2018 04:54:12 +0000 (04:54 +0000)]
Merge "Delay DropBox until SettingsProvider becomes ready" into pi-dev
am:
5e61df7a8e
Change-Id: Ic87e82cf9c02e7c42313221613ad793b56f9da7e
Ryo Hashimoto [Fri, 16 Mar 2018 04:42:55 +0000 (04:42 +0000)]
Merge "Change FUSE_MAX_WRITE's value to 128KB" into pi-dev
am:
ebc30594e0
Change-Id: I2b7f32f7e500a8c4cacfeb84966d149b41e32ac8
Ryo Hashimoto [Fri, 16 Mar 2018 04:17:04 +0000 (04:17 +0000)]
Merge "Fix buffer size check in replyRead" into pi-dev
am:
cf7b8a1406
Change-Id: I10ad7a0798d11d15fba5e358abd38166f48af488
Rob Carr [Fri, 16 Mar 2018 04:10:59 +0000 (04:10 +0000)]
Merge "Ensure Surface is recreated if children are detached." into pi-dev
am:
7311bbd70b
Change-Id: Ic7f008990ecd0bcd936391681000c50d78daaa00
TreeHugger Robot [Fri, 16 Mar 2018 04:00:48 +0000 (04:00 +0000)]
Merge "Frameworks: Fix system server profiling" into pi-dev
Jaewan Kim [Fri, 16 Mar 2018 03:46:17 +0000 (03:46 +0000)]
Merge "MediaSession2: Remove MediaSession2#registerPlayerEventCallback()" into pi-dev
am:
eb8e914ea7
Change-Id: I1ec5617fa7baade1dac16ba5bb55a04766055e46
Jaewan Kim [Fri, 16 Mar 2018 03:38:03 +0000 (03:38 +0000)]
Merge "MediaSession2: Remove onPlaylistChanged() without metadata" into pi-dev
am:
9cc144850f
Change-Id: Ie0306ae01bac8abf7b4e7a4c3001fed21cb53fa3
TreeHugger Robot [Fri, 16 Mar 2018 03:36:00 +0000 (03:36 +0000)]
Merge "Delay DropBox until SettingsProvider becomes ready" into pi-dev
Makoto Onuki [Fri, 16 Mar 2018 03:31:11 +0000 (03:31 +0000)]
Merge "Add phenotype flag to disable battery saver tron log" into pi-dev
am:
fc1784233b
Change-Id: I5abc925c966f7e2827c039c9041283d4311ac663
Robert Carr [Fri, 16 Mar 2018 03:27:56 +0000 (03:27 +0000)]
Merge "Fix resetting of wallpaper offset." into pi-dev
am:
012c971e4c
Change-Id: Ic6edc048723272611cfca774f7cad58fa51410bd
Peiyong Lin [Fri, 16 Mar 2018 03:22:53 +0000 (03:22 +0000)]
Merge "Replace android_color_mode usage with ColorMode." into pi-dev
am:
0cb97d5501
Change-Id: Ic9ae6281e823de6535877ab35fc9ed0fc73c188e
Jaewan Kim [Wed, 14 Mar 2018 11:37:38 +0000 (20:37 +0900)]
MediaSession2: Implement PlaylistParams replacements
This includes following changes
- Remove PlaylistParams
- Implement PlaylistParams replacements. Here's the list.
- get/setShuffleMode()
- get/setRepeatMode()
- Note: Playlist metadata APIs are already submitted (b/
74174649)
Bug:
74116823, Bug:
74118768
Test: Run CTS with MediaComponents/runcts.sh
Change-Id: I0267ffeaf92257eb7b81ffc8b6a3f40b5a2f6f9c
Doris Ling [Fri, 16 Mar 2018 03:19:51 +0000 (03:19 +0000)]
Merge "Use the correct prebuilts for lifecycles." into pi-dev
am:
9fd538dac6
Change-Id: I238b8ace1b78d5134d8b504c877792371daaa883
Jerry Zhang [Fri, 16 Mar 2018 03:15:07 +0000 (03:15 +0000)]
Merge "Update USB charging strings" into pi-dev
am:
f836c8940a
Change-Id: I47ec3758b8246f3c4471a1eedc37d0a186c3ac01
Robert Carr [Fri, 16 Mar 2018 03:11:49 +0000 (03:11 +0000)]
Merge "Bump activity stop timeout past ANR timeout." into pi-dev
am:
82c4ae150c
Change-Id: I1df6ebf343abd907da0072d885578130b2da8435
TreeHugger Robot [Fri, 16 Mar 2018 03:00:44 +0000 (03:00 +0000)]
Merge "Change FUSE_MAX_WRITE's value to 128KB" into pi-dev
TreeHugger Robot [Fri, 16 Mar 2018 02:57:51 +0000 (02:57 +0000)]
Merge "Fix buffer size check in replyRead" into pi-dev
Robert Carr [Fri, 16 Mar 2018 02:55:42 +0000 (02:55 +0000)]
Merge "Update JNI to call captureChildLayers" into pi-dev
am:
ed875ea132
Change-Id: I1426a013c412b1c2f97ec62c531b63efe98a1717
Kevin Neas [Fri, 16 Mar 2018 02:48:43 +0000 (02:48 +0000)]
Merge "Protecting against trying to launch apps that don't exist" into pi-dev
am:
9b8b54f9f6
Change-Id: I2dc8e043b9e6381085e3f066ac0705d106d54bac
Adam Newman [Fri, 9 Mar 2018 00:46:16 +0000 (16:46 -0800)]
Enable optional divider in AccessPointPreference
Create a new preference layout based on layout_preference_two_target
that will allow for the optional use of a second target with a ripple
animation that stops at the hairline divider as well as a toggle for the
hairline divider.
This will enable ConnectedAccessPointPreference to
display a split between the left and right half when a Captive Portal
signin is pending.
Bug:
63929546
Bug:
68031656
Test: make RunSettingsLibRoboTests
Test: manual testing with Captive Portal and normal WiFi networks.
Change-Id: I5c8c513290ed04a8dcc38c3f9d6c149c9cca08aa
(cherry picked from commit
c0a8276d9ffd8177c11c74ec4366e9d1d3546e73)
Android Build Merger (Role) [Fri, 16 Mar 2018 02:41:55 +0000 (02:41 +0000)]
Merge "Merge "Remove unnecessary static libraries in libmedia2_jni" into pi-dev am:
a2ab56a425" into pi-dev-plus-aosp
Dongwon Kang [Fri, 16 Mar 2018 02:41:29 +0000 (02:41 +0000)]
Merge "Remove unnecessary static libraries in libmedia2_jni" into pi-dev
am:
a2ab56a425
Change-Id: Icefc33d69731bdbad6da56999011ab2a48b1036d
Rob Carr [Fri, 16 Mar 2018 02:41:13 +0000 (02:41 +0000)]
Merge "Ensure Surface is recreated if children are detached." into pi-dev
Chen Xu [Fri, 16 Mar 2018 02:39:32 +0000 (02:39 +0000)]
Merge "reword title of CS rejection notification" am:
790e4f475f
am:
c443d8645f -s ours
Change-Id: I43739bfaf58e1d58c534263304cd1268c72f6ba8
Jaewan Kim [Fri, 16 Mar 2018 02:32:44 +0000 (02:32 +0000)]
Merge "MediaSession2: Remove MediaSession2#registerPlayerEventCallback()" into pi-dev
Jaewan Kim [Fri, 16 Mar 2018 02:31:36 +0000 (02:31 +0000)]
Merge "MediaSession2: Remove onPlaylistChanged() without metadata" into pi-dev
TreeHugger Robot [Fri, 16 Mar 2018 02:30:12 +0000 (02:30 +0000)]
Merge "Add phenotype flag to disable battery saver tron log" into pi-dev
TreeHugger Robot [Fri, 16 Mar 2018 02:14:51 +0000 (02:14 +0000)]
Merge "Fix resetting of wallpaper offset." into pi-dev
Hyundo Moon [Fri, 16 Mar 2018 02:13:53 +0000 (02:13 +0000)]
Merge "MediaSession2: Convert DataSourceDesc to MediaItem2 in MyPlayerEventCallback" into pi-dev
am:
b0179a3a44
Change-Id: I9846192e7ef43fbfa98271e5961f88a89e320aad
Jason Monk [Fri, 16 Mar 2018 02:07:06 +0000 (02:07 +0000)]
Merge "SliceManager: Relax explicit checks on map a little bit" into pi-dev
am:
0b795eb88e
Change-Id: I7b480717453d7ace26033066279a3c20e68cb7aa
Chen Xu [Fri, 16 Mar 2018 02:06:17 +0000 (02:06 +0000)]
Merge "reword title of CS rejection notification"
am:
790e4f475f
Change-Id: Ief67959059827ace01249305f7d25fe3ed83308b
Peiyong Lin [Fri, 16 Mar 2018 02:05:01 +0000 (02:05 +0000)]
Merge "Replace android_color_mode usage with ColorMode." into pi-dev
Jaewan Kim [Thu, 15 Mar 2018 07:16:51 +0000 (16:16 +0900)]
MediaSession2: Remove MediaSession2#registerPlayerEventCallback()
Bug:
74157064
Test: Run CTS with MediaComponents/runcts.sh
Change-Id: Ia976c0ebe9f2b7eff0ae603db96ab106aa045cbc
TreeHugger Robot [Fri, 16 Mar 2018 01:58:23 +0000 (01:58 +0000)]
Merge "Use the correct prebuilts for lifecycles." into pi-dev
Jaewan Kim [Thu, 15 Mar 2018 07:10:34 +0000 (16:10 +0900)]
MediaSession2: Remove onPlaylistChanged() without metadata
Bug:
74174728
Test: Run CTS with MediaComponents/runcts.sh
Change-Id: I84495aa19bc03009c81cdefdf8e65fbff4b7bcb6
TreeHugger Robot [Fri, 16 Mar 2018 01:44:32 +0000 (01:44 +0000)]
Merge "Update USB charging strings" into pi-dev
TreeHugger Robot [Fri, 16 Mar 2018 01:41:54 +0000 (01:41 +0000)]
Merge "Bump activity stop timeout past ANR timeout." into pi-dev
Beverly [Fri, 16 Mar 2018 01:38:50 +0000 (01:38 +0000)]
Merge "Set audio attrs on volume + home button vibrations" into pi-dev
am:
9b449b75d2
Change-Id: Ic604bf52c559deadaaeed318713bcdeb2a208e10
Yi Jin [Thu, 15 Mar 2018 20:49:44 +0000 (13:49 -0700)]
Fix privacy tags based on PWG review meeting.
1. Remove unnecessary hex_hashs.
2. Make intent extras LOCAL
3. Make mnc EXPLICIT
4. Make diskstats error AUTO since it is only IOException.
It is safe to modify proto numbers since they are not used yet.
Bug:
74837756
Test: flash the changes and call incident -d, also updated go/irpf
Change-Id: Idee0e927515e737c9a42a1dc29cb3c05e6d91ca9
Miao-chen Chou [Fri, 16 Mar 2018 01:30:30 +0000 (01:30 +0000)]
Merge "Bluetooth: preserve one advertisement slot for GMS core" am:
00cc1847d3
am:
922ae0237f
Change-Id: Ifd790251d6531d3556af7b470e681f06f3e25070
Qingxi Li [Fri, 16 Mar 2018 01:18:07 +0000 (01:18 +0000)]
Merge "[UI Tweak] Move PIN eSIM error message button position" into pi-dev
am:
2ac51aab99
Change-Id: I604ee5e612fe0207f0a9eb3f605f966f6e5cdb37
Miao-chen Chou [Fri, 16 Mar 2018 01:13:07 +0000 (01:13 +0000)]
Merge "Bluetooth: preserve one advertisement slot for GMS core"
am:
00cc1847d3
Change-Id: I5a6d39107b49690e11afd8c7e394554fbf616e11
Wyatt Riley [Fri, 16 Mar 2018 01:10:28 +0000 (01:10 +0000)]
Merge changes from topic "am-
4832db20-4618-4c51-930c-
c4179c7f0a1b" into oc-dev am:
38860f2cab am:
4b8765ff4a am:
3b0285794a
am:
06fd47a0b8
Change-Id: I5180224e6be04b7043232b3c13c32178780db516
TreeHugger Robot [Fri, 16 Mar 2018 01:08:06 +0000 (01:08 +0000)]
Merge "Update JNI to call captureChildLayers" into pi-dev
TreeHugger Robot [Fri, 16 Mar 2018 01:07:09 +0000 (01:07 +0000)]
Merge "Protecting against trying to launch apps that don't exist" into pi-dev
David Chen [Fri, 16 Mar 2018 01:01:08 +0000 (01:01 +0000)]
Merge "Removes stats_log proto from uid map in statsd." into pi-dev
am:
bb75a991eb
Change-Id: Id34dd6c4955002b405fbd46c6d4b198a61700cd1
Wei Jia [Fri, 16 Mar 2018 00:55:06 +0000 (00:55 +0000)]
Merge "MediaPlayer2Impl: fix null object reference." into pi-dev
am:
2d76c3ce82
Change-Id: Ib38e150756b7843774a6e6fe7c605739ae34a417
Chen Xu [Fri, 16 Mar 2018 00:51:04 +0000 (00:51 +0000)]
Merge "reword title of CS rejection notification"
TreeHugger Robot [Fri, 16 Mar 2018 00:40:10 +0000 (00:40 +0000)]
Merge "Remove unnecessary static libraries in libmedia2_jni" into pi-dev
Kweku Adams [Fri, 16 Mar 2018 00:28:51 +0000 (00:28 +0000)]
Merge "Adding size suffix to diskstats fields." into pi-dev
am:
25300a1ff2
Change-Id: Ief93f4a7a8d2e6f03690e1d570d1c815ccc5c1c2
Chenjie Yu [Fri, 16 Mar 2018 00:22:01 +0000 (00:22 +0000)]
Merge "Fix uid for AppBreadcrumbReported for 3p app" into pi-dev
am:
a3178fc440
Change-Id: I681358bd056e92c0ecc18e8137bedd87e433b640
OSDN Git Service
