OSDN Git Service
Amin Shaikh [Tue, 27 Mar 2018 14:14:53 +0000 (14:14 +0000)]
Merge "Show ripples for QS tiles and footer buttons." into pi-dev
am:
b24dbfef71
Change-Id: I15054c07cd73cddb3b0c2daccc4d9bac4dd959fc
hughchen [Tue, 27 Mar 2018 14:01:49 +0000 (14:01 +0000)]
Merge "Add metric PREVIOUSLY_CONNECTED_DEVICES" into pi-dev
am:
4045fdc014
Change-Id: I883495f47e9d40d2d0664da4f8c245307b7eb065
TreeHugger Robot [Tue, 27 Mar 2018 14:00:19 +0000 (14:00 +0000)]
Merge "Show ripples for QS tiles and footer buttons." into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 13:46:41 +0000 (13:46 +0000)]
Merge "Add metric PREVIOUSLY_CONNECTED_DEVICES" into pi-dev
Amin Shaikh [Tue, 27 Mar 2018 13:42:46 +0000 (13:42 +0000)]
Merge "Fix tile text display for large font/display sizes" into pi-dev
am:
58b47f3d53
Change-Id: If9fb92d66ce971746c29835bf4affc3aa34b677f
Amin Shaikh [Tue, 27 Mar 2018 13:29:31 +0000 (13:29 +0000)]
Merge "Show status labels in wifi QS tile." into pi-dev
am:
a691b71e99
Change-Id: I4529c5fceb1b1ec07735bd998571148d74181387
TreeHugger Robot [Tue, 27 Mar 2018 13:24:53 +0000 (13:24 +0000)]
Merge "Fix tile text display for large font/display sizes" into pi-dev
Adrian Roos [Tue, 27 Mar 2018 13:22:15 +0000 (13:22 +0000)]
Merge "WM: Move mLayoutSeq to DisplayContent" into pi-dev
am:
5f60091450
Change-Id: Iea74b7c6d381fb933a0678c791cd727a7e3b3dfb
Mathew Inwood [Tue, 27 Mar 2018 13:18:28 +0000 (13:18 +0000)]
Merge "Fix merge conflicts between AOSP, pi-dev." into pi-dev-plus-aosp
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
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
TreeHugger Robot [Tue, 27 Mar 2018 13:10:24 +0000 (13:10 +0000)]
Merge "Show status labels in wifi QS tile." into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 13:09:27 +0000 (13:09 +0000)]
Merge "WM: Move mLayoutSeq to DisplayContent" into pi-dev
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
Mathew Inwood [Tue, 27 Mar 2018 12:52:05 +0000 (13:52 +0100)]
Fix merge conflicts between AOSP, pi-dev.
Due to changes between AOSP & internal master, the merge to these two
changes caused duplicated code:
Ieb4bd9cc439c6a5b8fb9424d8902d8b46aec309f
Ic0d5b8fa631c2bd583b6fc52b2ee3708c8113f59
Merged-In: Idd73c9938592c5c4d67cfb9efefdffed0dd5f262
Bug:
76450910
Test: m
Change-Id: I46130cfd82288a564f681e305e2060286b026bcf
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: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: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
hughchen [Tue, 27 Mar 2018 04:04:59 +0000 (12:04 +0800)]
Add metric PREVIOUSLY_CONNECTED_DEVICES
Bug:
74134939
Test: Build
Change-Id: I134e1aea2a562a8a3f33b340a7dfc643b89886d4
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
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
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: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:19:20 +0000 (09:19 +0000)]
Merge "Fix setRecoverySecretTypes to not always set snapshot pending" into pi-dev
am:
af13eeb110
Change-Id: Ibae3e0a4a9f8b2af534c44eb8a27b9d28a4177fc
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: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
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
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
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 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
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
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:46:13 +0000 (05:46 +0000)]
Merge "Fix privacy tags based on go/irpf." into pi-dev
am:
6e2ef53a72
Change-Id: Ib434d22521484e1f709cb0be8bbf16af39b40c47
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: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 04:40:40 +0000 (04:40 +0000)]
Merge "Modify Open Mobile API to follow Android API guidelines"
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
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
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
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
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
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
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
TreeHugger Robot [Tue, 27 Mar 2018 02:36:14 +0000 (02:36 +0000)]
Merge "Add metrics for new settings conditional cards." into pi-dev
Christofer Åkersten [Thu, 22 Mar 2018 14:20:39 +0000 (23:20 +0900)]
Remove unneeded context
Bug:
76001644
Test: compile
Change-Id: Ib6d581650ff22d90da2bdc9ad295eab595aefb25
TreeHugger Robot [Tue, 27 Mar 2018 02:30:25 +0000 (02:30 +0000)]
Merge "API council requested tweaks to DataUnit." into pi-dev
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
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
Yangster-mac [Tue, 13 Mar 2018 22:39:51 +0000 (15:39 -0700)]
Flush the past buckets in anomaly tracker when time jumps forward
E2e test for count/duration anomaly trackers.
Test: new statsd tests.
BUG: b/
74446029
Change-Id: Ia9be0240ba5021d44c1e1f096d67563e9138bb59
TreeHugger Robot [Tue, 27 Mar 2018 01:40:23 +0000 (01:40 +0000)]
Merge "Move FIRST_SDK_INT to @TestApi." into pi-dev
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