OSDN Git Service
Alison Cichowlas [Tue, 27 Mar 2018 13:30:11 +0000 (13:30 +0000)]
Merge "Update screenshot saving strings." into pi-dev am:
644ded01dd
am:
f3da2369c9
Change-Id: Iee45ad79955ec2365e4689eaf3d4dc69160a94e3
Lorenzo Colitti [Tue, 27 Mar 2018 13:22:43 +0000 (13:22 +0000)]
Merge "Allow third party cookies in the captive portal login app." into pi-dev am:
89868f29d0
am:
bcb1fb3570
Change-Id: Ie328d2b68764acfdffa45fd713b2d82db2eb1376
Alison Cichowlas [Tue, 27 Mar 2018 13:16:43 +0000 (13:16 +0000)]
Merge "Update screenshot saving strings." into pi-dev
am:
644ded01dd
Change-Id: I9a14a9763a7e4bb9bba9df843da18b48057d4389
Etan Cohen [Tue, 27 Mar 2018 13:16:32 +0000 (13:16 +0000)]
Merge "[RTT] Collect metrics on observed IEEE 802.11mc supporting APs" into pi-dev am:
861f7fae2f
am:
5a698ccfc7
Change-Id: I614f5c4c2e8e76d9971bd36f30220c4432557165
Lorenzo Colitti [Tue, 27 Mar 2018 13:10:26 +0000 (13:10 +0000)]
Merge "Allow third party cookies in the captive portal login app." into pi-dev
am:
89868f29d0
Change-Id: I0174124cad9c108a26594b0ddd6162ca3ea6e68d
Etan Cohen [Tue, 27 Mar 2018 13:05:21 +0000 (13:05 +0000)]
Merge "[RTT] Collect metrics on observed IEEE 802.11mc supporting APs" into pi-dev
am:
861f7fae2f
Change-Id: If2cab10fc1ee8a90ac37fbd953c6bc23ccd2d3f4
TreeHugger Robot [Tue, 27 Mar 2018 13:03:33 +0000 (13:03 +0000)]
Merge "Update screenshot saving strings." into pi-dev
Leon Scroggins III [Tue, 27 Mar 2018 13:02:39 +0000 (13:02 +0000)]
Merge "Update AnimatedImageDrawable docs" into pi-dev am:
6f5e83df3a
am:
5115645c5a
Change-Id: I8ba7f7eb28c5a03365c2b8cf79b846fe1f51b5a1
Leon Scroggins III [Tue, 27 Mar 2018 12:56:05 +0000 (12:56 +0000)]
Merge "Update AnimatedImageDrawable docs" into pi-dev
am:
6f5e83df3a
Change-Id: I5c864b2d4a16a96a60ed2c69e3263b570b3e901a
TreeHugger Robot [Tue, 27 Mar 2018 12:55:40 +0000 (12:55 +0000)]
Merge "Allow third party cookies in the captive portal login app." into pi-dev
Etan Cohen [Tue, 27 Mar 2018 12:51:20 +0000 (12:51 +0000)]
Merge "[RTT] Collect metrics on observed IEEE 802.11mc supporting APs" into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 12:47:22 +0000 (12:47 +0000)]
Merge "Update AnimatedImageDrawable docs" into pi-dev
Eric Sandness [Tue, 27 Mar 2018 12:42:53 +0000 (12:42 +0000)]
Merge "Permission Check For DPM.isDeviceProvisioned" into pi-dev am:
9f36c26f83
am:
f21a3796cb
Change-Id: Ib1879c2e4da140611ee08cb32afef7cd2c2198dc
Eric Sandness [Tue, 27 Mar 2018 12:36:01 +0000 (12:36 +0000)]
Merge "Permission Check For DPM.isDeviceProvisioned" into pi-dev
am:
9f36c26f83
Change-Id: Ie798dde6593e6d0786f541a5c2512eb388ca5554
Siarhei Vishniakou [Tue, 27 Mar 2018 12:35:52 +0000 (12:35 +0000)]
Merge "Suppress key validation logs" into pi-dev am:
e8c16570d4
am:
b63f23a0d7
Change-Id: I5b0aff923c1ab0a9d6274a76e6465d7308fb047c
Siarhei Vishniakou [Tue, 27 Mar 2018 12:29:13 +0000 (12:29 +0000)]
Merge "Suppress key validation logs" into pi-dev
am:
e8c16570d4
Change-Id: Ie11548342cdd0be1c263043869bff8747691c4c3
Eric Sandness [Tue, 27 Mar 2018 12:25:53 +0000 (12:25 +0000)]
Merge "Permission Check For DPM.isDeviceProvisioned" into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 12:18:22 +0000 (12:18 +0000)]
Merge "Suppress key validation logs" into pi-dev
Mathew Inwood [Tue, 27 Mar 2018 11:02:21 +0000 (11:02 +0000)]
[automerger skipped] Merge "More flexible API enforcement policy." into pi-dev am:
c6d9f7ce1d
am:
e52db912c7 -s ours
Change-Id: I7c59442fffffe85bae98654c084b3c0511480ea8
Rubin Xu [Tue, 27 Mar 2018 10:57:36 +0000 (10:57 +0000)]
Merge "Require strong auth after user is stopped" into pi-dev am:
7109908a4e
am:
33a0fe9daa
Change-Id: I3f819788b02f80caf55df46bdaf19bcf00f34121
Mathew Inwood [Tue, 27 Mar 2018 10:51:21 +0000 (10:51 +0000)]
Merge "More flexible API enforcement policy." into pi-dev
am:
c6d9f7ce1d
Change-Id: I397333316f8afaee0e2591afdf336325532bd2ed
Eran Messeri [Tue, 27 Mar 2018 10:50:09 +0000 (10:50 +0000)]
Merge "DPM: Separate storage of PasswordMetrics from other state" into pi-dev am:
734a8c9964
am:
349c220ee8
Change-Id: I9b712f872472438ef234e5505c85f78225f4a221
Rubin Xu [Tue, 27 Mar 2018 10:46:25 +0000 (10:46 +0000)]
Merge "Require strong auth after user is stopped" into pi-dev
am:
7109908a4e
Change-Id: I1386435d0e51e5c8381794d3e7fd325e69c042f0
Yueming Wang [Tue, 27 Mar 2018 10:45:58 +0000 (10:45 +0000)]
Merge "Add javadoc to explain ApnSetting conflict." into pi-dev am:
3cc7c4fc76
am:
5148a2e55f
Change-Id: I98a93f4f9dad2f50c18b5a14c3500d8598368a33
Eran Messeri [Tue, 27 Mar 2018 10:35:33 +0000 (10:35 +0000)]
Merge "DPM: Separate storage of PasswordMetrics from other state" into pi-dev
am:
734a8c9964
Change-Id: I103071ccf7e7a940edcb11400393593d50486ca9
TreeHugger Robot [Tue, 27 Mar 2018 10:34:38 +0000 (10:34 +0000)]
Merge "More flexible API enforcement policy." into pi-dev
Yueming Wang [Tue, 27 Mar 2018 10:30:37 +0000 (10:30 +0000)]
Merge "Add javadoc to explain ApnSetting conflict." into pi-dev
am:
3cc7c4fc76
Change-Id: I2370b8cc9b5b730d2bf2c4f522d955e952f74bdb
TreeHugger Robot [Tue, 27 Mar 2018 10:29:36 +0000 (10:29 +0000)]
Merge "Require strong auth after user is stopped" into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 10:22:46 +0000 (10:22 +0000)]
Merge "DPM: Separate storage of PasswordMetrics from other state" into pi-dev
Yueming Wang [Tue, 27 Mar 2018 10:19:13 +0000 (10:19 +0000)]
Merge "Add javadoc to explain ApnSetting conflict." into pi-dev
Eric Sandness [Tue, 27 Mar 2018 10:09:51 +0000 (10:09 +0000)]
Merge "Permission Check For DPM.getUserProvisioningState" into pi-dev am:
1ad8367249
am:
135b4fa15c
Change-Id: I927b602ff188ec92c155503fe2629364ddd7d49f
Eric Sandness [Tue, 27 Mar 2018 10:03:32 +0000 (10:03 +0000)]
Merge "Permission Check For DPM.getUserProvisioningState" into pi-dev
am:
1ad8367249
Change-Id: I8b33dcb4338ffa47c11d06f30e4d7b36f275fcd9
Eric Sandness [Tue, 27 Mar 2018 09:52:58 +0000 (09:52 +0000)]
Merge "Permission Check For DPM.getUserProvisioningState" into pi-dev
Robert Berry [Tue, 27 Mar 2018 09:52:25 +0000 (09:52 +0000)]
Merge "Fix setRecoverySecretTypes to not always set snapshot pending" into pi-dev am:
af13eeb110
am:
c5935d442d
Change-Id: I42cc114641755be42fb9c7269ae726f87e48f5a0
Jaewan Kim [Tue, 27 Mar 2018 09:24:27 +0000 (09:24 +0000)]
Merge changes from topics "session2_seekcompleted", "session2_pullout", "session2_fastforward" into pi-dev am:
51e33d1948
am:
4aa935c9ca
Change-Id: I20d38121ccdf50c07a1955b0cd4ec14249e91a2a
Jaewan Kim [Tue, 27 Mar 2018 09:21:21 +0000 (09:21 +0000)]
MediaSession2: Pull out Command/CommandGroup from the MediaSession2 am:
3b15124ecc
am:
13585d0af1
Change-Id: I7b2d2d5bb2273e522de4c3f5b244207468a8869f
Robert Berry [Tue, 27 Mar 2018 09:19:20 +0000 (09:19 +0000)]
Merge "Fix setRecoverySecretTypes to not always set snapshot pending" into pi-dev
am:
af13eeb110
Change-Id: Ibae3e0a4a9f8b2af534c44eb8a27b9d28a4177fc
Jaewan Kim [Tue, 27 Mar 2018 09:17:52 +0000 (09:17 +0000)]
MediaController2: Add fastForward() / rewind() am:
ab715ec20b
am:
bef45e5d16
Change-Id: I2d4e0e60bfc5d7b29c3a410b43a45e5892a00d86
Eric Sandness [Tue, 27 Mar 2018 08:56:40 +0000 (09:56 +0100)]
Permission Check For DPM.isDeviceProvisioned
Require the caller of DPM.isDeviceProvisioned() to hold the MANAGE_USERS
permission. The only callers should be within the framework itself, or
apps involved in device provisioning which already hold this permission.
Bug:
62343414
Test: Set TestDPC as Device Owner and use it to reset password
Test: com.android.server.devicepolicy.DevicePolicyManagerTest
Test: com.android.server.locksettings.LockSettingsServiceTests
Test: com.google.android.gts.devicepolicy.DevicePolicyManagerTest
Change-Id: Ie53deb5ba8679a5b431f2a8da60ec9710c44d56f
TreeHugger Robot [Tue, 27 Mar 2018 09:09:54 +0000 (09:09 +0000)]
Merge "Fix setRecoverySecretTypes to not always set snapshot pending" into pi-dev
Jaewan Kim [Tue, 27 Mar 2018 09:04:15 +0000 (09:04 +0000)]
Merge changes from topics "session2_seekcompleted", "session2_pullout", "session2_fastforward" into pi-dev
am:
51e33d1948
Change-Id: Ia5d67ef0232c69a50c96dd20cbf9111105e069e8
Jaewan Kim [Tue, 27 Mar 2018 08:59:03 +0000 (08:59 +0000)]
MediaSession2: Pull out Command/CommandGroup from the MediaSession2
am:
3b15124ecc
Change-Id: Ied11e199086ab29d01ca84e04e42e28fdd6b6eee
Jaewan Kim [Tue, 27 Mar 2018 08:53:48 +0000 (08:53 +0000)]
MediaController2: Add fastForward() / rewind()
am:
ab715ec20b
Change-Id: I74be2d8ed5797e8f18966e0665942536b3ae6966
Jaewan Kim [Tue, 27 Mar 2018 08:39:45 +0000 (08:39 +0000)]
Merge changes from topics "session2_seekcompleted", "session2_pullout", "session2_fastforward" into pi-dev
* changes:
MediaPlayerBase: Add PlayerEventCallback#onSeekCompleted()
MediaSession2: Pull out Command/CommandGroup from the MediaSession2
MediaController2: Add fastForward() / rewind()
yuemingw [Wed, 21 Mar 2018 16:32:09 +0000 (16:32 +0000)]
Add javadoc to explain ApnSetting conflict.
As per discussion with Amit, it's better to define "conflict"
of ApnSetting in DevicePolicyManager API javadoc.
Bug:
72153573
Test: not required.
Change-Id: I765dace36a3c9c491c988dc0a87479cdec620e37
Mathew Inwood [Thu, 22 Feb 2018 13:19:53 +0000 (13:19 +0000)]
More flexible API enforcement policy.
This CL adds the basics to set black, dark gray or light gray list
enforcement, rather than just black as before. It's not possible to
actually set the policy per-package yet.
PackageDexOptimizer still uses a single bit, for API checks on/off, rather
than the new enum. It assumes blacklist enforcement internally. This can
be improved in a follow up CL.
(cherry-picked from commit
e52130ae4cf3b046b38a09fc7cc7712f5b7fb83d)
Test: m
Test: Boot device
BUG:
73337509
Change-Id: Ieb4bd9cc439c6a5b8fb9424d8902d8b46aec309f
Merged-In: Idd73c9938592c5c4d67cfb9efefdffed0dd5f262
Richard Chou [Tue, 27 Mar 2018 08:27:26 +0000 (08:27 +0000)]
Merge "Reset SIM state if the subscription is no longer active." into pi-dev am:
4f3d29de54
am:
59dc7b1139
Change-Id: Ib2b2ac2cd24aa0663fab5d46e67e198c6a6b548c
Jin Seok Park [Tue, 27 Mar 2018 08:21:22 +0000 (08:21 +0000)]
Merge "ExifInterface: Remove casting int[] to long[]" into pi-dev am:
30d648ab7a
am:
23f169747c
Change-Id: Ie5d32c1d540883b78cc0fac59ebd803994e7e755
Richard Chou [Tue, 27 Mar 2018 08:20:18 +0000 (08:20 +0000)]
Merge "Reset SIM state if the subscription is no longer active." into pi-dev
am:
4f3d29de54
Change-Id: I69bdf0d2fd6fcfea2a2ae5b5d9056407e0a498e4
David Brazdil [Tue, 27 Mar 2018 08:15:29 +0000 (08:15 +0000)]
Merge "Remove from hidden API light greylist" into pi-dev am:
3caac870ef
am:
14014b5e9d
Change-Id: Ia20fb669b0f4537f617e89a2e503ae70d4d41bf0
Jin Seok Park [Tue, 27 Mar 2018 08:15:28 +0000 (08:15 +0000)]
Merge "ExifInterface: Remove casting int[] to long[]" into pi-dev
am:
30d648ab7a
Change-Id: I6d08177e8348bde93fc44cf1481d88902fdacd43
David Brazdil [Tue, 27 Mar 2018 08:08:38 +0000 (08:08 +0000)]
Merge "Remove from hidden API light greylist" into pi-dev
am:
3caac870ef
Change-Id: I154dcd166e81c2bf7fdc1ef99ae4d68862c976cb
Yangster-mac [Tue, 27 Mar 2018 08:03:21 +0000 (08:03 +0000)]
Merge "Flush the past buckets in anomaly tracker when time jumps forward" into pi-dev am:
cdc9d9008b
am:
3746711c66
Change-Id: Ifef47dde04f685756e660732954876a762a9b11d
Richard Chou [Tue, 27 Mar 2018 08:02:17 +0000 (08:02 +0000)]
Merge "Reset SIM state if the subscription is no longer active." into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 07:57:14 +0000 (07:57 +0000)]
Merge "ExifInterface: Remove casting int[] to long[]" into pi-dev
David Brazdil [Tue, 27 Mar 2018 07:53:02 +0000 (07:53 +0000)]
Merge "Remove from hidden API light greylist" into pi-dev
Jaewan Kim [Tue, 27 Mar 2018 00:35:59 +0000 (09:35 +0900)]
MediaPlayerBase: Add PlayerEventCallback#onSeekCompleted()
PlayerEventCallback#onSeekCompleted() will be called when the
MediaPlayerBase#seekTo() is completed. Following callbacks are also
added to listen the event.
- SessionCallback#onSeekCompleted()
- ControllerCallback#onSeekCompleted()
Bug:
74370608
Test: Build
Change-Id: Ib1ecd75f7e217ed9a927db3ab443073a1aef2074
Jaewan Kim [Mon, 26 Mar 2018 23:32:25 +0000 (08:32 +0900)]
MediaSession2: Pull out Command/CommandGroup from the MediaSession2
Bug:
74648408
Test: Build
Change-Id: I0a3d1ab6320c7b276e7b1defdccf9fa371ae02c0
Jaewan Kim [Mon, 19 Mar 2018 14:09:00 +0000 (23:09 +0900)]
MediaController2: Add fastForward() / rewind()
Following CLs are included
- Add MediaController2#fastForward() / rewind()
- Add MediaSession2.SessionCallback#onFastForward() / rewind()
Bug:
74724709
Test: Build
Change-Id: I0dd2b6c21931df937006ae26011ea9538720afee
Christofer Åkersten [Tue, 27 Mar 2018 07:46:09 +0000 (07:46 +0000)]
Merge "Remove unneeded context" into pi-dev am:
72e895fd9f
am:
a4d3ac7988
Change-Id: I8c5eabd47fc655b51854d7f05102c74a1b9bb081
Yangster-mac [Tue, 27 Mar 2018 07:42:53 +0000 (07:42 +0000)]
Merge "Flush the past buckets in anomaly tracker when time jumps forward" into pi-dev
am:
cdc9d9008b
Change-Id: If80468882bfdeb52b32a6451c102a3b717f4c234
Christofer Åkersten [Tue, 27 Mar 2018 07:33:52 +0000 (07:33 +0000)]
Merge "Remove unneeded context" into pi-dev
am:
72e895fd9f
Change-Id: I53e3f05bbd2ac91556eb2db74da5d41ca4d61c2f
TreeHugger Robot [Tue, 27 Mar 2018 07:21:21 +0000 (07:21 +0000)]
Merge "Flush the past buckets in anomaly tracker when time jumps forward" into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 07:17:24 +0000 (07:17 +0000)]
Merge "Remove unneeded context" into pi-dev
Cassie [Tue, 27 Mar 2018 07:08:31 +0000 (07:08 +0000)]
Merge "Move alpha long/short to the base CellIdentity according API Review." into pi-dev am:
c2bdecb8c8
am:
5999b8fce0
Change-Id: If0301f70f5e58f0cea43f6f9266f98336bf543e5
Cassie [Tue, 27 Mar 2018 06:56:19 +0000 (06:56 +0000)]
Merge "Move alpha long/short to the base CellIdentity according API Review." into pi-dev
am:
c2bdecb8c8
Change-Id: Ie210a52ffb6eafa09c390bc51d39e558ee297bfc
Rubin Xu [Tue, 27 Mar 2018 06:49:04 +0000 (06:49 +0000)]
Merge "Fix OTA info persistence logic" into pi-dev am:
ee7802f577
am:
08d7901d67
Change-Id: I49fbf44919c6bd7cd34845b9bce5437790be4af9
TreeHugger Robot [Tue, 27 Mar 2018 06:40:37 +0000 (06:40 +0000)]
Merge "Move alpha long/short to the base CellIdentity according API Review." into pi-dev
Rubin Xu [Tue, 27 Mar 2018 06:36:12 +0000 (06:36 +0000)]
Merge "Fix OTA info persistence logic" into pi-dev
am:
ee7802f577
Change-Id: I7d6375384b7f019548ef8760c282521d5afe949a
Ruchi Kandoi [Tue, 27 Mar 2018 06:23:25 +0000 (06:23 +0000)]
Merge "Modify Open Mobile API to follow Android API guidelines" am:
ee63876ed4 am:
2fa5be61cb
am:
b126fbb86a
Change-Id: I6b8dd7ac2b5dec262d23a7f59c6af7c3f0ac744c
TreeHugger Robot [Tue, 27 Mar 2018 06:22:16 +0000 (06:22 +0000)]
Merge "Fix OTA info persistence logic" into pi-dev
Ruchi Kandoi [Tue, 27 Mar 2018 06:09:49 +0000 (06:09 +0000)]
Merge "Modify Open Mobile API to follow Android API guidelines" am:
ee63876ed4
am:
2fa5be61cb
Change-Id: I51c6751318eed6781337e3b4c547d526dbd76135
Ruchi Kandoi [Tue, 27 Mar 2018 06:03:08 +0000 (06:03 +0000)]
Merge "Modify Open Mobile API to follow Android API guidelines"
am:
ee63876ed4
Change-Id: I29c43bcdccb3ba263c0a6a7e106c3c9180910c75
Jin Seok Park [Tue, 20 Mar 2018 01:23:46 +0000 (10:23 +0900)]
ExifInterface: Remove casting int[] to long[]
This CL removes code that directly casts int[] to long[] and instead
iterates through the individual values and casts to int if necessary.
They are cast to integer because StripOffsets/StripByteCounts
Attributes can return either int[] or long[] values, but the maximum
length of a file that ExifInterface can handle is the maximum value
of integer, so it should be safe to cast the long values to integer
values.
Bug:
73091048
Test: Cts
Change-Id: I9f3b98204e0829a8a8a30927bb8c0a698c457654
Yi Jin [Tue, 27 Mar 2018 05:57:16 +0000 (05:57 +0000)]
Merge "Fix privacy tags based on go/irpf." into pi-dev am:
6e2ef53a72
am:
9423318c80
Change-Id: I21d5928ce9d6678bbf3c8f8fe1b0c3f96822cd07
Jeff Sharkey [Tue, 27 Mar 2018 05:52:47 +0000 (05:52 +0000)]
Merge "Ignore mkdirs requests while storage is locked." into pi-dev am:
c98ee8b964
am:
a1dfff1d1e
Change-Id: I767ab298e9dc1aa739e8916f5b5acacd08abf131
Yi Jin [Tue, 27 Mar 2018 05:46:13 +0000 (05:46 +0000)]
Merge "Fix privacy tags based on go/irpf." into pi-dev
am:
6e2ef53a72
Change-Id: Ib434d22521484e1f709cb0be8bbf16af39b40c47
Felipe Leme [Tue, 27 Mar 2018 05:42:41 +0000 (05:42 +0000)]
Merge "Integrate autofill session lifecycle with URL bar changes when on compat mode." into pi-dev am:
992d078542
am:
85584bcb20
Change-Id: Iaa4e79b744c71b7e666ac026e108128eb96255c1
Jeff Sharkey [Tue, 27 Mar 2018 05:38:34 +0000 (05:38 +0000)]
Merge "Ignore mkdirs requests while storage is locked." into pi-dev
am:
c98ee8b964
Change-Id: I38c9b948a00c43c349ea3a12c61f4b307bdf4329
TreeHugger Robot [Tue, 27 Mar 2018 05:35:25 +0000 (05:35 +0000)]
Merge "Fix privacy tags based on go/irpf." into pi-dev
Felipe Leme [Tue, 27 Mar 2018 05:30:59 +0000 (05:30 +0000)]
Merge "Integrate autofill session lifecycle with URL bar changes when on compat mode." into pi-dev
am:
992d078542
Change-Id: I5720f372fa5638bbe2dca67a42962765f1a40bd1
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:18:47 +0000 (05:18 +0000)]
Merge "Ignore mkdirs requests while storage is locked." into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 05:15:20 +0000 (05:15 +0000)]
Merge "Integrate autofill session lifecycle with URL bar changes when on compat mode." into pi-dev
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
Treehugger Robot [Tue, 27 Mar 2018 04:40:40 +0000 (04:40 +0000)]
Merge "Modify Open Mobile API to follow Android API guidelines"
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
OSDN Git Service
