OSDN Git Service
TreeHugger Robot [Tue, 27 Mar 2018 05:24:21 +0000 (05:24 +0000)]
Merge "Fix check for null at wrong level of indirection."
TreeHugger Robot [Tue, 27 Mar 2018 05:10:47 +0000 (05:10 +0000)]
Merge "statsd: Pass alert and config id to Perfetto"
Svet Ganov [Tue, 27 Mar 2018 05:08:29 +0000 (05:08 +0000)]
Merge "Don't allow acccess to uninstalled system providers" into pi-dev am:
bf47ae3152
am:
a2f46f1ef7
Change-Id: Ibb8fa84c01deb85f555e2d7464e6a574670e4b0f
Jeff Sharkey [Tue, 27 Mar 2018 05:01:33 +0000 (05:01 +0000)]
Merge "Give DPM callers unsafe labels." into pi-dev am:
a80057c359
am:
4df6caea71
Change-Id: I0fc1afd3dda2b62310883fd17e1cd09d530788a4
Jeff Sharkey [Tue, 27 Mar 2018 04:41:54 +0000 (04:41 +0000)]
Merge "API council requested tweaks to TrafficStats." into pi-dev am:
9a6bc76ee8
am:
efae42a25d
Change-Id: I65c961a839a3b7404f753d3278c70bc50f918b7f
Jeff Sharkey [Tue, 27 Mar 2018 04:28:07 +0000 (04:28 +0000)]
Merge "Report final progress when finished copying." into pi-dev am:
01f2ff1aa4
am:
190d3520af
Change-Id: I8cbdc28d8a72d4d3a9ef7a92e2ba6ea95c3618dc
Jerry Zhang [Tue, 27 Mar 2018 04:22:06 +0000 (04:22 +0000)]
Merge "Revert "Add additional context to MtpDatabase"" into pi-dev am:
02a005703a
am:
66cb4826ef
Change-Id: I2f4a5c41e9c1a4bb22df77989c27467eca518c4b
Svet Ganov [Tue, 27 Mar 2018 04:19:46 +0000 (04:19 +0000)]
Merge "Don't allow acccess to uninstalled system providers" into pi-dev
am:
bf47ae3152
Change-Id: I559684b93914020702636ee21ff0f79138740a77
Jeff Sharkey [Tue, 27 Mar 2018 04:13:02 +0000 (04:13 +0000)]
Merge "Give DPM callers unsafe labels." into pi-dev
am:
a80057c359
Change-Id: I1db954072cd00caa70ef527b885a1893668b3eac
Jeff Sharkey [Tue, 27 Mar 2018 03:57:46 +0000 (03:57 +0000)]
Merge "API council requested tweaks to TrafficStats." into pi-dev
am:
9a6bc76ee8
Change-Id: I6b969377a6e268c1377fcc17f2443cb73072fda2
Jerry Zhang [Tue, 27 Mar 2018 03:57:23 +0000 (03:57 +0000)]
Merge "Write descriptors for Mtp in UsbService" into pi-dev am:
df101a4596
am:
03f2788598
Change-Id: If6a24ce29d891159a60e4690eb82ef83b2f82885
Jeff Sharkey [Tue, 27 Mar 2018 03:45:07 +0000 (03:45 +0000)]
Merge "Report final progress when finished copying." into pi-dev
am:
01f2ff1aa4
Change-Id: I1421da9d91c172fb9afff1e5960a9c86ff2d794d
Jeff Sharkey [Tue, 27 Mar 2018 03:44:10 +0000 (03:44 +0000)]
Merge "Fix NPE when UID doesn't exist." into pi-dev am:
31e1171fd8
am:
a93fcd5983
Change-Id: I8a373415195858d489051b319a5b4122860c0a81
Jerry Zhang [Tue, 27 Mar 2018 03:39:57 +0000 (03:39 +0000)]
Merge "Revert "Add additional context to MtpDatabase"" into pi-dev
am:
02a005703a
Change-Id: Id1667df7f50096619e7207d42a0212139eab7758
Jeff Sharkey [Tue, 27 Mar 2018 03:29:15 +0000 (03:29 +0000)]
Merge "API council requested tweaks to SystemClock." into pi-dev am:
0bff5a6dfa
am:
de5b4f3c99
Change-Id: Ic19a334c177c4eaeb3882479f6e5fcfb8644a0fb
Jerry Zhang [Tue, 27 Mar 2018 03:20:27 +0000 (03:20 +0000)]
Merge "Write descriptors for Mtp in UsbService" into pi-dev
am:
df101a4596
Change-Id: If12b1138a9be2f2e653c070c44d54ebfe008b7ff
TreeHugger Robot [Tue, 27 Mar 2018 03:16:25 +0000 (03:16 +0000)]
Merge "Don't allow acccess to uninstalled system providers" into pi-dev
Jeff Sharkey [Tue, 27 Mar 2018 03:14:48 +0000 (03:14 +0000)]
Merge "Fix NPE when UID doesn't exist." into pi-dev
am:
31e1171fd8
Change-Id: I2426e4d9d105637874aa51885b728ce3962f0698
Lucas Dupin [Tue, 27 Mar 2018 03:14:08 +0000 (03:14 +0000)]
Merge "Fix issue where bouncer would go away" into pi-dev am:
fddbae9c78
am:
574eff078d
Change-Id: I5789ab85d4e43ce7c6fdbfbaaccc746a77a4f0df
Fan Zhang [Tue, 27 Mar 2018 03:08:34 +0000 (03:08 +0000)]
Merge "Add metrics for new settings conditional cards." into pi-dev am:
930f74d00d
am:
08276a051c
Change-Id: Ic3b24bd25048a3495e849f3689dc60a59fbda6b1
TreeHugger Robot [Tue, 27 Mar 2018 03:06:37 +0000 (03:06 +0000)]
Merge "Give DPM callers unsafe labels." into pi-dev
Jeff Sharkey [Tue, 27 Mar 2018 03:04:34 +0000 (03:04 +0000)]
Merge "API council requested tweaks to SystemClock." into pi-dev
am:
0bff5a6dfa
Change-Id: I5b7d6247342eaddb8024842cecfc516ae2aa5fcc
Jeff Sharkey [Tue, 27 Mar 2018 03:01:08 +0000 (03:01 +0000)]
Merge "API council requested tweaks to DataUnit." into pi-dev am:
b15bcea4d4
am:
2b00e5c3fd
Change-Id: I14ae729a10b9f3d1e12ea3ada1fe69589d6c90e1
TreeHugger Robot [Tue, 27 Mar 2018 02:56:24 +0000 (02:56 +0000)]
Merge "API council requested tweaks to TrafficStats." into pi-dev
Lucas Dupin [Tue, 27 Mar 2018 02:52:48 +0000 (02:52 +0000)]
Merge "Fix issue where bouncer would go away" into pi-dev
am:
fddbae9c78
Change-Id: I372570965e1199bb15343eba5740f71ed11cb3b7
TreeHugger Robot [Tue, 27 Mar 2018 02:52:26 +0000 (02:52 +0000)]
Merge "Report final progress when finished copying." into pi-dev
Jerry Zhang [Tue, 27 Mar 2018 02:49:30 +0000 (02:49 +0000)]
Merge "Revert "Add additional context to MtpDatabase"" into pi-dev
Jerry Zhang [Tue, 27 Mar 2018 02:49:02 +0000 (02:49 +0000)]
Merge "Write descriptors for Mtp in UsbService" into pi-dev
Fan Zhang [Tue, 27 Mar 2018 02:48:46 +0000 (02:48 +0000)]
Merge "Add metrics for new settings conditional cards." into pi-dev
am:
930f74d00d
Change-Id: I4f7f98b3f4cda9c0c072121913a2a252dd022cfe
TreeHugger Robot [Tue, 27 Mar 2018 02:44:02 +0000 (02:44 +0000)]
Merge "Fix NPE when UID doesn't exist." into pi-dev
Christofer Åkersten [Tue, 27 Mar 2018 02:43:00 +0000 (02:43 +0000)]
Merge "Hide Media*2 APIs" into pi-dev am:
855617501c
am:
1cbf0b4c60
Change-Id: Ib8febd8195ede10de7307ff3ac3c8daa6c5dcfb9
Jeff Sharkey [Tue, 27 Mar 2018 02:41:52 +0000 (02:41 +0000)]
Merge "API council requested tweaks to DataUnit." into pi-dev
am:
b15bcea4d4
Change-Id: Ibf7dce0c3d823135834a5160bc55da94c3b874e4
TreeHugger Robot [Tue, 27 Mar 2018 02:40:24 +0000 (02:40 +0000)]
Merge "API council requested tweaks to SystemClock." into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 02:37:35 +0000 (02:37 +0000)]
Merge "Fix issue where bouncer would go away" into pi-dev
Jeff Sharkey [Tue, 27 Mar 2018 02:37:11 +0000 (02:37 +0000)]
Merge "Move FIRST_SDK_INT to @TestApi." into pi-dev am:
fee443bfab
am:
9d81c54bc8
Change-Id: Iff5a6cb3e48402cf56e1641db4e8fd15d6de7ffb
TreeHugger Robot [Tue, 27 Mar 2018 02:36:14 +0000 (02:36 +0000)]
Merge "Add metrics for new settings conditional cards." into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 02:30:25 +0000 (02:30 +0000)]
Merge "API council requested tweaks to DataUnit." into pi-dev
Lucas Dupin [Tue, 27 Mar 2018 02:26:19 +0000 (02:26 +0000)]
Merge "Fix flickering when switching display power modes" into pi-dev am:
5e0957aaed
am:
85178a5604
Change-Id: I5fa659068aebeee06988ea699dbd0d5be18a2bdc
Hall Liu [Tue, 27 Mar 2018 02:12:12 +0000 (02:12 +0000)]
Merge "[automerger skipped] Merge "Split the DownloadStateCallback class into two" am:
aa8f09d41a am:
b1cb52e1a8 -s ours" into pi-dev-plus-aosp
am:
165bbe9228 -s ours
Change-Id: I37e215f8db77ce5dfa579fde655f769065ca31c9
Christofer Åkersten [Tue, 27 Mar 2018 02:04:08 +0000 (02:04 +0000)]
Merge "Hide Media*2 APIs" into pi-dev
am:
855617501c
Change-Id: Id9523e20766e68422a2808383623e11f5e799de2
Hall Liu [Tue, 27 Mar 2018 01:53:11 +0000 (01:53 +0000)]
[automerger skipped] Merge "Split the DownloadStateCallback class into two" am:
aa8f09d41a am:
b1cb52e1a8 -s ours
am:
8d67ba80ae -s ours
Change-Id: Ie6ac719581ea1175987b51105a2fd8c90a25d007
Jeff Sharkey [Tue, 27 Mar 2018 01:53:01 +0000 (01:53 +0000)]
Merge "Move FIRST_SDK_INT to @TestApi." into pi-dev
am:
fee443bfab
Change-Id: Ie2a6b0bb46ea6275cb2af0ef006472daf5e80b14
Christofer Åkersten [Tue, 27 Mar 2018 01:46:42 +0000 (01:46 +0000)]
Merge "Hide Media*2 APIs" into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 01:40:23 +0000 (01:40 +0000)]
Merge "Move FIRST_SDK_INT to @TestApi." into pi-dev
Matthew Ng [Tue, 27 Mar 2018 01:39:15 +0000 (01:39 +0000)]
Merge "Fixes the inability to start quickscrub because hit target is none" into pi-dev am:
f856f352ab
am:
9112e74f36
Change-Id: Ic65bda3d4e944b82720563106922d61c0f262ad7
Seigo Nonaka [Tue, 27 Mar 2018 01:36:16 +0000 (01:36 +0000)]
Merge "Stop using DynamicLayout in case of non selectable PrecomputedText" into pi-dev am:
a1ff74c68d
am:
b2d133a858
Change-Id: I5669d0b2b4eea79e782e980cd7993d06d5183c49
Jeff Sharkey [Tue, 27 Mar 2018 01:32:36 +0000 (01:32 +0000)]
Merge "Add linter for strings.xml." into pi-dev am:
642c0be3f3
am:
6527cd70a2
Change-Id: I63b2c1e8be1e3ac908094b9822f0c5cc4072196e
Lucas Dupin [Tue, 27 Mar 2018 01:25:38 +0000 (01:25 +0000)]
Merge "Fix flickering when switching display power modes" into pi-dev
am:
5e0957aaed
Change-Id: If60109cfeb9f5e059b0bf1963eadd7b2e2c8748c
Svet Ganov [Sat, 24 Mar 2018 08:05:33 +0000 (01:05 -0700)]
Don't allow acccess to uninstalled system providers
If system providers are not installed yet we aggressively crash to avoid
creating multiple instance of these providers and then bad things happen!
Test: manual
Bug:
72457712
Change-Id: I5d7da8c05c08f719a8996b48bffa2317193c1275
Android Build Merger (Role) [Tue, 27 Mar 2018 01:21:37 +0000 (01:21 +0000)]
Merge "[automerger skipped] Merge "Split the DownloadStateCallback class into two" am:
aa8f09d41a am:
b1cb52e1a8 -s ours" into pi-dev-plus-aosp
Hall Liu [Tue, 27 Mar 2018 01:20:41 +0000 (01:20 +0000)]
[automerger skipped] Merge "Split the DownloadStateCallback class into two" am:
aa8f09d41a
am:
b1cb52e1a8 -s ours
Change-Id: I87ed98ccbb62e13bc88f5cfe7e00b15364711969
Jeff Sharkey [Tue, 27 Mar 2018 01:19:23 +0000 (19:19 -0600)]
Give DPM callers unsafe labels.
Tests want the full label, so give it to them.
Test: none
Bug:
74254785
Change-Id: Ia358ee54396ee0a0684fd352c7133f54d9f8c4a7
Matthew Ng [Tue, 27 Mar 2018 01:19:21 +0000 (01:19 +0000)]
Merge "Fixes the inability to start quickscrub because hit target is none" into pi-dev
am:
f856f352ab
Change-Id: I83e40ef4f253890441369e46479b62487eaf27b5
Ajay Panicker [Tue, 27 Mar 2018 01:16:27 +0000 (01:16 +0000)]
[automerger skipped] Merge "Add the AVRCP Target Service (2/2)" into pi-dev am:
d3a6af439e -s ours
am:
3ea74ae05e -s ours
Change-Id: I79567281be090a592e4e1165159f3be1a8ae1767
Seigo Nonaka [Tue, 27 Mar 2018 01:11:24 +0000 (01:11 +0000)]
Merge "Stop using DynamicLayout in case of non selectable PrecomputedText" into pi-dev
am:
a1ff74c68d
Change-Id: Ic003d918ce83224e3daa513a0a8c8ee161f62c42
Hall Liu [Tue, 27 Mar 2018 01:10:16 +0000 (01:10 +0000)]
Merge "Split the DownloadStateCallback class into two"
am:
aa8f09d41a
Change-Id: Id31521d2a138a0a3ef98ea5a56d19621c757dc90
Ajay Panicker [Tue, 27 Mar 2018 01:07:11 +0000 (01:07 +0000)]
[automerger skipped] Add the AVRCP Target Service (2/2) am:
0a9258f435 -s ours
am:
1c7fe9f63c -s ours
Change-Id: Icb7ac96788faeca0d5acd09ace81f5f79b815391
Jeff Sharkey [Tue, 27 Mar 2018 01:06:54 +0000 (01:06 +0000)]
Merge "Add linter for strings.xml." into pi-dev
am:
642c0be3f3
Change-Id: I9677257b4ddfe5c1347b6de13b98e2b25fd649ac
Ajay Panicker [Tue, 27 Mar 2018 01:01:53 +0000 (01:01 +0000)]
[automerger skipped] Merge "Add the AVRCP Target Service (2/2)" into pi-dev
am:
d3a6af439e -s ours
Change-Id: I538ec1a08ac8f7e4c403a2559831042414d1d9bb
Winson Chung [Tue, 27 Mar 2018 00:59:17 +0000 (00:59 +0000)]
Merge "Fix issue with multiple recent tasks showing after restarting the device" into pi-dev am:
20ebb32825
am:
59af233fe8
Change-Id: Ie660665105d34ec7f2c1fef839174bb5945ba0ff
Chen Xu [Tue, 27 Mar 2018 00:54:37 +0000 (00:54 +0000)]
Merge "throw runtimeException for applicable TM APIs" into pi-dev am:
17aa751907
am:
7d38883e1b
Change-Id: I3be6e23cbcc31a46759275878f4d3a5681a1bdaf
Ajay Panicker [Tue, 27 Mar 2018 00:50:15 +0000 (00:50 +0000)]
[automerger skipped] Add the AVRCP Target Service (2/2)
am:
0a9258f435 -s ours
Change-Id: Iebb8e4c29c37e8afa18f364a94f5eb4b874ee786
Lucas Dupin [Tue, 27 Mar 2018 00:48:17 +0000 (00:48 +0000)]
Merge "Fix flickering when switching display power modes" into pi-dev
Winson Chung [Tue, 27 Mar 2018 00:45:24 +0000 (00:45 +0000)]
Merge "Fix issue with multiple recent tasks showing after restarting the device" into pi-dev
am:
20ebb32825
Change-Id: Icf92ea2e9573d41157c973690fe5a0457abc2207
Philip P. Moltmann [Tue, 27 Mar 2018 00:45:07 +0000 (00:45 +0000)]
Merge "Run instant app pruning in background thread" into pi-dev am:
a1b9a31f1e
am:
a1e6c8fdf3
Change-Id: Ib8040410dabaa4176eb4e8f8f70217028d1641ef
TreeHugger Robot [Tue, 27 Mar 2018 00:43:55 +0000 (00:43 +0000)]
Merge "Fixes the inability to start quickscrub because hit target is none" into pi-dev
Chen Xu [Tue, 27 Mar 2018 00:39:59 +0000 (00:39 +0000)]
Merge "throw runtimeException for applicable TM APIs" into pi-dev
am:
17aa751907
Change-Id: I44ab8310928658c38bae9522b31515ee6c36d6d2
Chenjie Yu [Tue, 27 Mar 2018 00:37:23 +0000 (00:37 +0000)]
Merge "Up the dimension key limit for CpuTimePerUidFreq" into pi-dev am:
dafbeecaf7
am:
40842f86f7
Change-Id: Ifd7a70a7177c48591f699ebd9d43524deeede289
Philip P. Moltmann [Tue, 27 Mar 2018 00:28:02 +0000 (00:28 +0000)]
Merge "Run instant app pruning in background thread" into pi-dev
am:
a1b9a31f1e
Change-Id: I5137b68961cba761256220e7b5fe9f00474df3f7
Chenjie Yu [Tue, 27 Mar 2018 00:20:34 +0000 (00:20 +0000)]
Merge "Up the dimension key limit for CpuTimePerUidFreq" into pi-dev
am:
dafbeecaf7
Change-Id: Ic0fda3ce07eec50e40e27cd88dc7c2d6c7ed8a5a
Abodunrinwa Toki [Tue, 27 Mar 2018 00:18:34 +0000 (00:18 +0000)]
Merge "Fix random SmartLinkify-related TextView bugs." into pi-dev am:
d982f561cc
am:
62c135418d
Change-Id: Ibf482b7f40eb99ea53d9ed7187beeed0e7ff8195
TreeHugger Robot [Tue, 27 Mar 2018 00:10:11 +0000 (00:10 +0000)]
Merge "Stop using DynamicLayout in case of non selectable PrecomputedText" into pi-dev
Abodunrinwa Toki [Mon, 26 Mar 2018 23:59:02 +0000 (23:59 +0000)]
Merge "Fix random SmartLinkify-related TextView bugs." into pi-dev
am:
d982f561cc
Change-Id: I231dd3046832556a55ea8a5eec7b288c9a199f9f
Jeff Sharkey [Mon, 26 Mar 2018 23:57:34 +0000 (23:57 +0000)]
Merge "Add linter for strings.xml." into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 23:54:39 +0000 (23:54 +0000)]
Merge "Add the AVRCP Target Service (2/2)" into pi-dev
Treehugger Robot [Mon, 26 Mar 2018 23:53:40 +0000 (23:53 +0000)]
Merge "Split the DownloadStateCallback class into two"
Fan Zhang [Mon, 26 Mar 2018 23:52:53 +0000 (16:52 -0700)]
Add metrics for new settings conditional cards.
Bug:
76022431
Test: rebuild
Change-Id: I12541a43d742c17e22db701050bb7b72bd423522
Matthew Ng [Mon, 26 Mar 2018 23:51:20 +0000 (23:51 +0000)]
Merge "Fixes drawing quickscrub track in correct location with cutout" into pi-dev am:
a76018de57
am:
87f64d3420
Change-Id: I8cd8490895e6b586b9cffdaa9a04a9cfeef9eec3
Winson Chung [Mon, 26 Mar 2018 23:45:22 +0000 (23:45 +0000)]
Merge "Fix issue with multiple recent tasks showing after restarting the device" into pi-dev
Chen Xu [Mon, 26 Mar 2018 23:39:56 +0000 (23:39 +0000)]
Merge "throw runtimeException for applicable TM APIs" into pi-dev
Matthew Ng [Mon, 26 Mar 2018 23:39:36 +0000 (23:39 +0000)]
Merge "Fixes drawing quickscrub track in correct location with cutout" into pi-dev
am:
a76018de57
Change-Id: Ic2d9c1d1f486f4aac99b03b5a25351b65447c47e
Dmitry Dementyev [Mon, 26 Mar 2018 23:36:47 +0000 (23:36 +0000)]
Merge "Use Builder instead for KeyChainProtectionParams." into pi-dev am:
5b4a0d6751
am:
82476a3d52
Change-Id: Iec2ea078b5804be48857f8f04c15e126d57634a7
TreeHugger Robot [Mon, 26 Mar 2018 23:34:50 +0000 (23:34 +0000)]
Merge "Run instant app pruning in background thread" into pi-dev
Rubin Xu [Mon, 26 Mar 2018 23:28:35 +0000 (23:28 +0000)]
Merge "Disallow copy & paste from personal to profile under policy" into pi-dev am:
22d10bc586
am:
e2745a3bb7
Change-Id: I80b25fabd6750e8a2d3d91c52f629f81a6ce9796
TreeHugger Robot [Mon, 26 Mar 2018 23:28:30 +0000 (23:28 +0000)]
Merge "Up the dimension key limit for CpuTimePerUidFreq" into pi-dev
Dmitry Dementyev [Mon, 26 Mar 2018 23:26:27 +0000 (23:26 +0000)]
Merge "Use Builder instead for KeyChainProtectionParams." into pi-dev
am:
5b4a0d6751
Change-Id: I27700c001112a0778a3599679f46914000e36174
Andrew Chant [Mon, 26 Mar 2018 23:23:14 +0000 (23:23 +0000)]
Merge changes I72688f65,I2dd8d439 into pi-dev am:
ae0b962865
am:
6568eec338
Change-Id: Ia21cb148114f3ddd83b015dc87d7c6ab0ab2fc53
TreeHugger Robot [Mon, 26 Mar 2018 23:21:37 +0000 (23:21 +0000)]
Merge "Fix random SmartLinkify-related TextView bugs." into pi-dev
Rubin Xu [Mon, 26 Mar 2018 23:19:11 +0000 (23:19 +0000)]
Merge "Disallow copy & paste from personal to profile under policy" into pi-dev
am:
22d10bc586
Change-Id: Ie4cec95ab77024d92f0923600c341c6baa7707c1
David Chen [Mon, 26 Mar 2018 23:18:19 +0000 (23:18 +0000)]
Merge "Fix uidmap in statsd." into pi-dev am:
d41fad71a6
am:
bc341cdf02
Change-Id: I52167c72f6c544a29db71de93a57a241150f2bda
TreeHugger Robot [Mon, 26 Mar 2018 23:17:25 +0000 (23:17 +0000)]
Merge "Fixes drawing quickscrub track in correct location with cutout" into pi-dev
Ajay Panicker [Fri, 16 Mar 2018 11:00:27 +0000 (04:00 -0700)]
Add the AVRCP Target Service (2/2)
Add the AVRCP Target constant to Bluetooth Profile. Also remove redundant
public static final modifier on the constants.
Bug:
68854188
Test: Compiles and local test with service enabled
Change-Id: If2ec607fc704c225f8903d438fe970dfafac25f1
(cherry picked from commit
38c3073ba2532db7b5adf5f7f96cef847771c41b)
Merged-In: If2ec607fc704c225f8903d438fe970dfafac25f1
Andrew Chant [Mon, 26 Mar 2018 23:08:16 +0000 (23:08 +0000)]
Merge changes I72688f65,I2dd8d439 into pi-dev
am:
ae0b962865
Change-Id: Iefb0c90fd64c20ecfc1c1e73ca1a7c69d0b849de
Philip P. Moltmann [Mon, 26 Mar 2018 23:08:15 +0000 (23:08 +0000)]
Merge "Make PackageManager#getNamesForUids testable." into pi-dev am:
9360a31f5f
am:
895b6a19a6
Change-Id: I91c97b4755173c0c870f692b0026886b0e03faf5
Dmitry Dementyev [Mon, 26 Mar 2018 23:07:23 +0000 (23:07 +0000)]
Merge "Use Builder instead for KeyChainProtectionParams." into pi-dev
David Chen [Mon, 26 Mar 2018 23:02:48 +0000 (23:02 +0000)]
Merge "Fix uidmap in statsd." into pi-dev
am:
d41fad71a6
Change-Id: Ia61b30b34fa8e0fa7e4f189ba39fa4a2335b409c
Philip P. Moltmann [Mon, 26 Mar 2018 22:56:01 +0000 (22:56 +0000)]
Merge "Make PackageManager#getNamesForUids testable." into pi-dev
am:
9360a31f5f
Change-Id: Ie4c8cb0ffa78bd1a008aad2eae9caae6c2c0afb5
Mady Mellor [Mon, 26 Mar 2018 22:55:31 +0000 (22:55 +0000)]
Merge "Fix string description" into pi-dev am:
2ed9bf437e
am:
b2309652e6
Change-Id: I998cab6cc993df82e29efa74392733617812b8a1
Jeff Sharkey [Mon, 26 Mar 2018 22:54:36 +0000 (16:54 -0600)]
Report final progress when finished copying.
Test: none
Bug:
74120182
Change-Id: I984d38505545b5f18dd3dd9a3c6f714a9ea86edd
Jeff Sharkey [Mon, 26 Mar 2018 22:50:59 +0000 (16:50 -0600)]
Fix NPE when UID doesn't exist.
This can happen when the usage was performed by a synthetic UID,
such as TrafficStats.UID_TETHERING or UID_REMOVED.
Test: none
Bug:
74195808
Change-Id: I2859a8f5f4a1611c48bb56386ad4b2335a87f611
OSDN Git Service
