OSDN Git Service
Patrick Baumann [Thu, 8 Feb 2018 22:21:15 +0000 (14:21 -0800)]
Honor INSTANT_APPS_ENABLED only for web intents
Bug:
65959668
Test: manual - toggle setting with test app and verify behavior
Test: atest EphemeralTest
Change-Id: I379a17027abd337610243c1f7c55e9ba733d03fe
TreeHugger Robot [Thu, 8 Feb 2018 20:43:20 +0000 (20:43 +0000)]
Merge "Cache VectorDrawable bounds at record time"
TreeHugger Robot [Thu, 8 Feb 2018 20:24:31 +0000 (20:24 +0000)]
Merge "Modifies statsd output for start and end times."
TreeHugger Robot [Thu, 8 Feb 2018 20:21:26 +0000 (20:21 +0000)]
Merge "Frameworks: Annotate trivial @GuardedBy in services/ misc"
TreeHugger Robot [Thu, 8 Feb 2018 20:15:14 +0000 (20:15 +0000)]
Merge "Simplify untrusted reset logic"
TreeHugger Robot [Thu, 8 Feb 2018 19:56:26 +0000 (19:56 +0000)]
Merge "Ignores protected broadcasts if not priv-app"
TreeHugger Robot [Thu, 8 Feb 2018 19:52:46 +0000 (19:52 +0000)]
Merge "Fix bad rebase in ag/
3577127."
TreeHugger Robot [Thu, 8 Feb 2018 19:50:22 +0000 (19:50 +0000)]
Merge "Removing EXPLICIT tag from shared uid name."
David Brazdil [Thu, 8 Feb 2018 19:42:49 +0000 (19:42 +0000)]
Merge "Move more hidden APIs into light greylist"
TreeHugger Robot [Thu, 8 Feb 2018 19:41:26 +0000 (19:41 +0000)]
Merge "Use new minikin::Font constructor"
TreeHugger Robot [Thu, 8 Feb 2018 19:40:16 +0000 (19:40 +0000)]
Merge "Add cycle information to DataUsageInfo."
TreeHugger Robot [Thu, 8 Feb 2018 19:37:35 +0000 (19:37 +0000)]
Merge "Clamp ripple starting x/y further"
David Brazdil [Thu, 8 Feb 2018 18:56:22 +0000 (18:56 +0000)]
Move more hidden APIs into light greylist
We see these being used by apps tested against pi-release.
Bug:
73105914
Bug:
73103669
Bug:
73106486
Bug:
64382372
Bug:
73103081
Bug:
73119220
Test: make
Change-Id: I5a77b9bdbec1e8eed3f8d5d402ebd007799ef403
TreeHugger Robot [Thu, 8 Feb 2018 19:29:51 +0000 (19:29 +0000)]
Merge "Install for all on replace"
Etan Cohen [Thu, 8 Feb 2018 19:03:27 +0000 (19:03 +0000)]
Merge "[RTT] Deprecate legacy RTT API"
Stan Iliev [Wed, 7 Feb 2018 19:07:30 +0000 (14:07 -0500)]
Cache VectorDrawable bounds at record time
Cache VectorDrawable bounds at record time, because the same
drawable object may be used several times with different bounds.
Bug:
71737362
Test: Wrote a new unit test, tried sample app attached to the bug
Change-Id: If7be934acf0c16b328cb0f95d849e463dcd3b88b
Siyamed Sinir [Thu, 8 Feb 2018 18:55:17 +0000 (18:55 +0000)]
Merge "Remove Toki from text OWNERS files"
TreeHugger Robot [Thu, 8 Feb 2018 18:50:00 +0000 (18:50 +0000)]
Merge "Statsd notifies listener with pendingintent."
TreeHugger Robot [Thu, 8 Feb 2018 18:34:45 +0000 (18:34 +0000)]
Merge "Cellular Tx power added to Volta historian"
Amin Shaikh [Thu, 8 Feb 2018 18:17:48 +0000 (13:17 -0500)]
Fix bad rebase in ag/
3577127.
Don't consume touch events in QSScrollLayout if the view cannot be
scrolled in either direction.
Bug:
70799330
Test: visual
Change-Id: I3779e9a07724132c609182b60a6748c359f5fe3b
Jan Nordqvist [Tue, 30 Jan 2018 01:27:24 +0000 (17:27 -0800)]
Add cycle information to DataUsageInfo.
Test: manual
Bug:
70950124
Change-Id: I0afd5657788e95b72d3d420b47a06e6527892d23
TreeHugger Robot [Thu, 8 Feb 2018 18:13:11 +0000 (18:13 +0000)]
Merge "Catch and log exceptions when setting system property"
Patrick Baumann [Thu, 8 Feb 2018 17:16:21 +0000 (09:16 -0800)]
Ignores protected broadcasts if not priv-app
Change-Id: I5bd2bf3bd7c38fd9cc563a02b24bc569495d79ed
Fixes:
65423991
Test: manual - system starts without issue
Test: manual - wrote test app to verify only priv-app protected-broadcast can block broadcasts of non-system apps
Fyodor Kupolov [Wed, 7 Feb 2018 18:50:23 +0000 (10:50 -0800)]
Catch and log exceptions when setting system property
Otherwise they can cause system restart since the code is running
on main thread.
Failure to set the mapped property shouldn't be catastrophic, because
the mapping is primarily used for experiments.
Test: manual
Bug:
73018322
Change-Id: I80bb71c67fa74c1830618795c39ea15b8964ef2e
David Chen [Fri, 2 Feb 2018 02:27:51 +0000 (18:27 -0800)]
Modifies statsd output for start and end times.
We include the start of when the last dump occurred and the current
timestamp. These timestamps are shared across all metrics, so
there's no advantage in duplicating these numbers across all metrics.
Also, we should use elapsed realtime instead of times based on wall
clock, which can jump around and go backwards.
Test: Test that statsd can still build and
adb shell cmd stats dump-report doesn't crash.
Change-Id: I819e5643cee75dfa3e78a58f94c9d61ededa78d7
Patrick Baumann [Wed, 7 Feb 2018 17:05:12 +0000 (09:05 -0800)]
Install for all on replace
Prior to this change, installing for all users that results in a replace
will only install for currently installed users. This change ensures
that when USER_ALL is defined, that we properly update settings for all
users.
Change-Id: Ie2aae958d012e60e002aef84c90c5573bc06b158
Fixes:
64472557
Test: manual - adb install for single user, replace for all works
Jiuyu Sun [Thu, 8 Feb 2018 17:34:30 +0000 (17:34 +0000)]
Merge "Revert "Public EuiccManager APIs.""
Pavel Grafov [Thu, 8 Feb 2018 17:22:12 +0000 (17:22 +0000)]
Merge "Run and log BoringSSL self-test for NIAP compliance."
Winson Chung [Thu, 8 Feb 2018 17:06:48 +0000 (17:06 +0000)]
Merge "Revert "Revert "Exposing content insets and minimized home bounds for recents transition"""
Selim Cinek [Thu, 8 Feb 2018 16:59:54 +0000 (16:59 +0000)]
Merge "Removed the ripple for actions with remote inputs"
Phil Weaver [Thu, 8 Feb 2018 16:52:43 +0000 (16:52 +0000)]
Merge "Fix a11ynodeinfo parceling"
Jiuyu Sun [Thu, 8 Feb 2018 16:38:26 +0000 (16:38 +0000)]
Revert "Public EuiccManager APIs."
This reverts commit
af6a5fffdc5ef30065f8bc2d1280bbd87eae3c64.
Reason for revert: <INSERT REASONING HERE>
Change-Id: Id3296a91e5c3ad624a6a03f6532b859524a518bf
TreeHugger Robot [Thu, 8 Feb 2018 15:43:50 +0000 (15:43 +0000)]
Merge "Fix bug in calculating path in ArcMotion"
TreeHugger Robot [Thu, 8 Feb 2018 15:06:53 +0000 (15:06 +0000)]
Merge "Fix APCT tests"
TreeHugger Robot [Thu, 8 Feb 2018 14:17:11 +0000 (14:17 +0000)]
Merge "Add overscroll support for QS."
Narayan Kamath [Thu, 8 Feb 2018 12:40:53 +0000 (12:40 +0000)]
Merge "SystemUI: Remove obsolete dependency on android.car."
Narayan Kamath [Thu, 8 Feb 2018 12:40:48 +0000 (12:40 +0000)]
Merge "BatteryStatsNoteTest: Fix GPS related tests."
Etan Cohen [Thu, 8 Feb 2018 12:09:21 +0000 (12:09 +0000)]
[automerger] Merge "Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am:
50d4e94767" into cw-f-dev am:
9e5c21243c am:
5a590c68df am:
ad8bae1b73 am:
84f311b805 am:
761ac5fdcb
am:
085cfc88cd
Change-Id: I26095e307c60b8fe75a0562aeef571c25296f43d
Etan Cohen [Thu, 8 Feb 2018 11:50:23 +0000 (11:50 +0000)]
[automerger] Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am:
50d4e94767 am:
1aab54a3a3 am:
3979121a99 am:
d1e93e361c am:
bd7573db8f am:
a9bab4e5f6
am:
6cf122d72e
Change-Id: I54894e2a86b93766a3b66a5dd296cc89e8af89e8
Etan Cohen [Thu, 8 Feb 2018 11:32:17 +0000 (11:32 +0000)]
[automerger] Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-dev am:
fa72a625cc am:
cdc187ee10 am:
363b273e9a am:
0c8b40873e am:
d2428ebae4 am:
bc7bb6c274 am:
7c2ccdd777 am:
b374c759dc
am:
401dd4040e
Change-Id: I4d1178a3e0561264738bc935b28c8896e93ffb04
Etan Cohen [Thu, 8 Feb 2018 11:14:51 +0000 (11:14 +0000)]
Merge "Merge changes from topic "am-
02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev am:
39e6bc7495" into oc-dev am:
d0adbcb4e2 am:
655059b334 am:
e5058056f4
am:
d2c268a117
Change-Id: I54c724c0f1ada7ac923b9d680690ab51cd55deab
Clara Bayarri [Thu, 8 Feb 2018 11:14:10 +0000 (11:14 +0000)]
Remove Toki from text OWNERS files
Test: none
Change-Id: I9e444318df4a77ee06949d5141667f6c00d9a508
Etan Cohen [Thu, 8 Feb 2018 10:55:43 +0000 (10:55 +0000)]
[automerger] Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-mr1-dev am:
bd629f69ed am:
1d10387f0d am:
7f4440640b am:
5c777fbcef am:
fa6d41a295 am:
2fc3c754c6
am:
c9da92828f
Change-Id: I01d98678ac8b4e423f4dba79a6768eb8d9f24768
TreeHugger Robot [Thu, 8 Feb 2018 10:41:46 +0000 (10:41 +0000)]
Merge "Synchronize VibrationService"
Etan Cohen [Thu, 8 Feb 2018 10:26:32 +0000 (10:26 +0000)]
[automerger] Merge "Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am:
50d4e94767" into cw-f-dev am:
9e5c21243c am:
5a590c68df am:
ad8bae1b73 am:
84f311b805
am:
761ac5fdcb
Change-Id: Idb6ad30dece553759ba6f24591e7856d80341395
Andreas Gampe [Wed, 7 Feb 2018 23:34:27 +0000 (15:34 -0800)]
Frameworks: Annotate trivial @GuardedBy in services/ misc
Add @GuardedBy for simple functions that require a single lock
and are named XYZLocked.
Derived by errorprone.
Bug:
73000847
Test: m
Test: m javac-check-framework RUN_ERROR_PRONE=true
Change-Id: Id1d9fbe5018250e3b9d1466fc5f670d5ad902fa3
Etan Cohen [Thu, 8 Feb 2018 10:17:27 +0000 (10:17 +0000)]
Merge changes from topic "am-
075f69afbbda4610b4adfcdcb0fd78fc" into oc-dev am:
8e5ec12799 am:
b6eed228bc am:
557941309a
am:
46984ff82c
Change-Id: I58ebdbc14901edf9bd8678c7114a49ca2a0a209f
Etan Cohen [Thu, 8 Feb 2018 10:02:36 +0000 (10:02 +0000)]
[automerger] Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am:
50d4e94767 am:
1aab54a3a3 am:
3979121a99 am:
d1e93e361c am:
bd7573db8f
am:
a9bab4e5f6
Change-Id: Id0e9fd3aae59894c63a3276fc6c9fffa0ca17a34
Etan Cohen [Thu, 8 Feb 2018 09:45:54 +0000 (09:45 +0000)]
[automerger] Merge "Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am:
50d4e94767" into cw-f-dev am:
9e5c21243c am:
5a590c68df am:
ad8bae1b73
am:
84f311b805
Change-Id: Idb48480b8075f4e11cd47b06ddb9fb4816815433
Etan Cohen [Thu, 8 Feb 2018 09:40:37 +0000 (09:40 +0000)]
[automerger] Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-dev am:
fa72a625cc am:
cdc187ee10 am:
363b273e9a am:
0c8b40873e am:
d2428ebae4 am:
bc7bb6c274 am:
7c2ccdd777
am:
b374c759dc
Change-Id: I1ce0b88c95c2b824f4fecb5163e4b3dc7757d96c
Etan Cohen [Thu, 8 Feb 2018 09:30:46 +0000 (09:30 +0000)]
[automerger] Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am:
4feca3b99f am:
b164f1dce0 am:
651db1820d am:
024efb4645 am:
c9e1d843b2 am:
a5802150c4 am:
bb074ffe22
am:
9f728ee9ba
Change-Id: I8267c8aab546ebb3ce38d2c704e5c3de27b9a9d7
Etan Cohen [Thu, 8 Feb 2018 09:23:39 +0000 (09:23 +0000)]
[automerger] Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am:
50d4e94767 am:
1aab54a3a3 am:
3979121a99 am:
d1e93e361c
am:
bd7573db8f
Change-Id: I6aa8290672e9df9a99e7346e9df86c03e64cda58
Etan Cohen [Thu, 8 Feb 2018 09:17:38 +0000 (09:17 +0000)]
Merge "Merge changes from topic "am-
02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev am:
39e6bc7495" into oc-dev am:
d0adbcb4e2 am:
655059b334
am:
e5058056f4
Change-Id: I7be1aff3d71535f93b06adff2a196a32d320bb1b
Rubin Xu [Wed, 7 Feb 2018 08:52:34 +0000 (08:52 +0000)]
Simplify untrusted reset logic
Instead re-initializing the synthetic password, just call
setLockCredentialWithAuthTokenLocked similar to normal flow
since we have the cached auth token.
The existing synthetic password initializtaion flow actually
has a bug when an untrusted reset to clear password is invoked:
it wrongly assumes that it's in case 2 and creates a new SID for
the user, instead of clearing it. This leads to the CTS failure.
Test: On a FBE device, execute cts-tradefed run cts -m CtsDevicePolicyManagerTestCases
-t com.android.cts.devicepolicy.MixedDeviceOwnerTestApi25 and verify device unlocks
successfully after the reboot.
Bug:
72875989
Change-Id: I5939335a27b10528b772d193f1e1034fd79abb9b
TreeHugger Robot [Thu, 8 Feb 2018 09:10:45 +0000 (09:10 +0000)]
Merge "Fixes installed launch intent rewrite"
Etan Cohen [Thu, 8 Feb 2018 09:08:24 +0000 (09:08 +0000)]
Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into oc-dev am:
4839fb4abd am:
beef47bfee am:
3da59c5940
am:
f9ac9e64e2
Change-Id: Ic282162f6817daad5c6a2ecacc5d0693550a8571
Etan Cohen [Thu, 8 Feb 2018 09:06:07 +0000 (09:06 +0000)]
[automerger] Merge "Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am:
50d4e94767" into cw-f-dev am:
9e5c21243c am:
5a590c68df
am:
ad8bae1b73
Change-Id: I8f4db5b6b97eca28404de8fc990c18f9a8f50575
Etan Cohen [Thu, 8 Feb 2018 09:01:28 +0000 (09:01 +0000)]
[automerger] Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-dev am:
fa72a625cc am:
cdc187ee10 am:
363b273e9a am:
0c8b40873e am:
d2428ebae4 am:
bc7bb6c274
am:
7c2ccdd777
Change-Id: I61d28182d86e1655d078ff9cb8c3ba001cc6c9ae
Etan Cohen [Thu, 8 Feb 2018 08:51:33 +0000 (08:51 +0000)]
[automerger] Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-mr1-dev am:
bd629f69ed am:
1d10387f0d am:
7f4440640b am:
5c777fbcef am:
fa6d41a295
am:
2fc3c754c6
Change-Id: I2a9bd8f1cad36631e18c92e59e2ee72a231354c7
Etan Cohen [Thu, 8 Feb 2018 08:45:32 +0000 (08:45 +0000)]
[automerger] Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am:
50d4e94767 am:
1aab54a3a3 am:
3979121a99
am:
d1e93e361c
Change-Id: Ice0a36135954e952b307b7ee909ec4add3c5d6ee
TreeHugger Robot [Thu, 8 Feb 2018 08:43:37 +0000 (08:43 +0000)]
Merge "Remove wifi/ScanResult.averageRssi method"
TreeHugger Robot [Thu, 8 Feb 2018 08:42:17 +0000 (08:42 +0000)]
Merge "Revert "Temporary Threshold for Binder Proxy Tracking""
Etan Cohen [Thu, 8 Feb 2018 08:41:37 +0000 (08:41 +0000)]
Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into oc-dev am:
827eb741d7 am:
03c97d0a92 am:
f75de43ec4
am:
58af29990d
Change-Id: I9b1c6f159abb2f1ac2d0696059a6e5a15278d8d1
Etan Cohen [Thu, 8 Feb 2018 08:35:03 +0000 (08:35 +0000)]
Merge "Merge changes from topic "am-
02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev am:
39e6bc7495" into oc-dev am:
d0adbcb4e2
am:
655059b334
Change-Id: I15de97114e5e3ac7c2ff24c0c7c4c4a9dddd89cc
Etan Cohen [Thu, 8 Feb 2018 08:25:53 +0000 (08:25 +0000)]
[automerger] Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-dev am:
fa72a625cc am:
cdc187ee10 am:
363b273e9a am:
0c8b40873e am:
d2428ebae4
am:
bc7bb6c274
Change-Id: I1f8ded34983a29bde17ffd1927a11fb67becb38e
Etan Cohen [Thu, 8 Feb 2018 08:22:52 +0000 (08:22 +0000)]
Merge changes from topic "am-
075f69afbbda4610b4adfcdcb0fd78fc" into oc-dev am:
8e5ec12799 am:
b6eed228bc
am:
557941309a
Change-Id: Ie1f3b458f779c0fe2e1d4bcd98079c5d7d0de254
Etan Cohen [Thu, 8 Feb 2018 08:07:30 +0000 (08:07 +0000)]
Merge "Merge changes from topic "am-
02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev am:
39e6bc7495" into oc-dev
am:
d0adbcb4e2
Change-Id: I287c62a8b83662ba112809ce2aa07c5a3f04fb6d
Etan Cohen [Thu, 8 Feb 2018 08:02:47 +0000 (08:02 +0000)]
[automerger] Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am:
eac0551992 am:
196b64c28c am:
af8b7b859a am:
25b8c8b3fb am:
c290ad3333 am:
b26a010054 am:
000e6625c4 am:
7bd058e35e am:
04a707b5f2
am:
9bf40c3f42
Change-Id: I33365e70164f63ddf88395dcce4013b6cc79c365
Etan Cohen [Thu, 8 Feb 2018 07:59:23 +0000 (07:59 +0000)]
[automerger] Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-mr1-dev am:
bd629f69ed am:
1d10387f0d am:
7f4440640b am:
5c777fbcef
am:
fa6d41a295
Change-Id: Iae246cb8b7601877b4d74b2940ca01847cae5a4c
Etan Cohen [Thu, 8 Feb 2018 07:58:57 +0000 (07:58 +0000)]
[automerger] Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am:
4feca3b99f am:
b164f1dce0 am:
651db1820d am:
024efb4645 am:
c9e1d843b2 am:
a5802150c4
am:
bb074ffe22
Change-Id: Id5a2f9e75805e6bbffdec4efb6c3cc21629f139a
TreeHugger Robot [Thu, 8 Feb 2018 07:46:35 +0000 (07:46 +0000)]
Merge "Tune haptic feedback for quickstep when quickstep is enabled (1/2)"
Etan Cohen [Thu, 8 Feb 2018 07:36:20 +0000 (07:36 +0000)]
Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-mr2-dev am:
e12dda4b7c" into oc-dev am:
08833f4f58 am:
f28aa657bc am:
13635e0177
am:
f142725e76
Change-Id: Ib6ded72a083f35cfd0fe195bb62d98d3e79935f5
Etan Cohen [Thu, 8 Feb 2018 07:34:43 +0000 (07:34 +0000)]
Merge changes from topic "am-
075f69afbbda4610b4adfcdcb0fd78fc" into oc-dev am:
8e5ec12799
am:
b6eed228bc
Change-Id: I3928e7364f73369f86fbddbb5d23ecdb57c235cd
Etan Cohen [Thu, 8 Feb 2018 07:30:43 +0000 (07:30 +0000)]
[automerger] Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-mr1-dev am:
bd629f69ed am:
1d10387f0d am:
7f4440640b
am:
5c777fbcef
Change-Id: Ib7e482deaac700c58a8cf9fc9514c3890b3e7d9b
Etan Cohen [Thu, 8 Feb 2018 07:30:01 +0000 (07:30 +0000)]
Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into oc-dev am:
4839fb4abd am:
beef47bfee
am:
3da59c5940
Change-Id: I8f114ec9baea79623dce7f211571fcc8ddf56174
Android Build Merger (Role) [Thu, 8 Feb 2018 07:10:08 +0000 (07:10 +0000)]
Etan Cohen [Thu, 8 Feb 2018 07:09:49 +0000 (07:09 +0000)]
Merge changes from topic "am-
dac98ec1428b47c5bf6a45c28771bf33" into oc-dev am:
2ef9262f9a am:
e7a0ce2afa am:
beba3a40c5
am:
e02e908024
Change-Id: Ie1127776352e58f17bb3e19dda449e21370756df
Etan Cohen [Thu, 8 Feb 2018 07:09:48 +0000 (07:09 +0000)]
[automerger] Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am:
4feca3b99f am:
b164f1dce0 am:
651db1820d am:
024efb4645 am:
c9e1d843b2
am:
a5802150c4
Change-Id: Ieccbb5238167cb3853f09f647d3ef49cdd02c5f1
Etan Cohen [Thu, 8 Feb 2018 07:09:02 +0000 (07:09 +0000)]
Merge changes from topic "am-
075f69afbbda4610b4adfcdcb0fd78fc" into oc-dev
am:
8e5ec12799
Change-Id: I3eed03bdd6515f32bb419fee9a9f9af9367ab424
Etan Cohen [Thu, 8 Feb 2018 07:01:24 +0000 (07:01 +0000)]
Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into oc-dev am:
827eb741d7 am:
03c97d0a92
am:
f75de43ec4
Change-Id: Ia101af66bfc163a4476e43c2e801f0147c0d5d6e
Andreas Gampe [Mon, 5 Feb 2018 21:27:39 +0000 (13:27 -0800)]
Frameworks: Annotate trivial @GuardedBy in media
Add @GuardedBy for simple functions that require a single lock
and are named XYZLocked.
Derived by errorprone.
Bug:
73000847
Test: m
Test: m javac-check-framework RUN_ERROR_PRONE=true
Change-Id: I17e265a771604a06792566c2dd1842f9fe6439e7
TreeHugger Robot [Thu, 8 Feb 2018 06:51:33 +0000 (06:51 +0000)]
Merge "Allow-while-idle alarms throttling for app standby"
Etan Cohen [Thu, 8 Feb 2018 06:46:44 +0000 (06:46 +0000)]
Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into oc-dev am:
4839fb4abd
am:
beef47bfee
Change-Id: I3792100af3d64b1ee520b0403ddfdb5198dee346
Android Build Merger (Role) [Thu, 8 Feb 2018 06:36:52 +0000 (06:36 +0000)]
Merge "[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-mr1-dev am:
a6d45d9768 am:
c2f948ccc1 am:
4c4cf86e9d am:
7179a3425c am:
2fe9543fda am:
02a661909c am:
a8202b929b"
Etan Cohen [Thu, 8 Feb 2018 06:36:09 +0000 (06:36 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-mr1-dev am:
a6d45d9768 am:
c2f948ccc1 am:
4c4cf86e9d am:
7179a3425c am:
2fe9543fda am:
02a661909c
am:
a8202b929b
Change-Id: I7081321b6a6dec60d45f963cf8364d6d0cfde562
TreeHugger Robot [Thu, 8 Feb 2018 06:35:07 +0000 (06:35 +0000)]
Merge "Check for null LOCATION_PROVIDERS_ALLOWED value"
Etan Cohen [Thu, 8 Feb 2018 06:34:06 +0000 (06:34 +0000)]
[automerger] Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am:
4feca3b99f am:
b164f1dce0 am:
651db1820d am:
024efb4645
am:
c9e1d843b2
Change-Id: I28ecedebcea9fdac3858626cdac2c0a2bc8925f5
Etan Cohen [Thu, 8 Feb 2018 06:31:48 +0000 (06:31 +0000)]
[automerger] Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am:
eac0551992 am:
196b64c28c am:
af8b7b859a am:
25b8c8b3fb am:
c290ad3333 am:
b26a010054 am:
000e6625c4 am:
7bd058e35e
am:
04a707b5f2
Change-Id: I0c8f651c09d06a0c5664bc64b17f048cc3ffa446
Etan Cohen [Thu, 8 Feb 2018 06:21:54 +0000 (06:21 +0000)]
Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into oc-dev am:
827eb741d7
am:
03c97d0a92
Change-Id: I80025b0036a7d9b5a77e3807bff44ef22aa898d2
Etan Cohen [Thu, 8 Feb 2018 06:13:44 +0000 (06:13 +0000)]
Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into oc-dev
am:
4839fb4abd
Change-Id: I330f9c4e3732d4655e294d6ad2c1ab120ce10b10
Etan Cohen [Thu, 8 Feb 2018 06:06:39 +0000 (06:06 +0000)]
Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-mr2-dev am:
e12dda4b7c" into oc-dev am:
08833f4f58 am:
f28aa657bc
am:
13635e0177
Change-Id: I117e1e30a985ae8e7a07a7f2f7957878b6cc7414
TreeHugger Robot [Thu, 8 Feb 2018 06:04:51 +0000 (06:04 +0000)]
Merge "Frameworks: Annotate trivial @GuardedBy in services/autofill"
Etan Cohen [Thu, 8 Feb 2018 05:57:25 +0000 (05:57 +0000)]
[automerger] Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am:
eac0551992 am:
196b64c28c am:
af8b7b859a am:
25b8c8b3fb am:
c290ad3333 am:
b26a010054 am:
000e6625c4
am:
7bd058e35e
Change-Id: Ibd656fd5a759fc864868da09e3b63bc2fadf204a
Etan Cohen [Thu, 8 Feb 2018 05:57:17 +0000 (05:57 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-dev am:
f780227541 am:
f4e8657a0e am:
2d3b87ce06 am:
5558a64435 am:
484e2c4ea1 am:
3938fca8fa am:
a97fcf83f5 am:
64177d4964
am:
aa8ddf16f4
Change-Id: I246fb6da9eabe5d0dd91c2bae6318d6ae78a096a
Etan Cohen [Thu, 8 Feb 2018 05:40:11 +0000 (05:40 +0000)]
Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into oc-dev
am:
827eb741d7
Change-Id: Ic35c752cb5435d00eb91df8e296a433e859c3afc
Etan Cohen [Thu, 8 Feb 2018 05:39:35 +0000 (05:39 +0000)]
Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-mr2-dev am:
e12dda4b7c" into oc-dev am:
08833f4f58
am:
f28aa657bc
Change-Id: Ib65b042822db0543d122bcdde18464617b60c6ab
Fan Zhang [Thu, 8 Feb 2018 05:38:56 +0000 (05:38 +0000)]
Merge "Turn on about phone v2"
Android Build Merger (Role) [Thu, 8 Feb 2018 05:35:02 +0000 (05:35 +0000)]
Etan Cohen [Thu, 8 Feb 2018 05:34:38 +0000 (05:34 +0000)]
Merge changes from topic "am-
922cd235076540bdb5f01e7024397331" into oc-dev am:
889b8f2146 am:
efce54b53d am:
6162ba99b7
am:
dde7511031
Change-Id: I2d7130d411010a0a0c8cc36d9f50d132aceafe4b
TreeHugger Robot [Thu, 8 Feb 2018 05:30:35 +0000 (05:30 +0000)]
Merge "Split HeadsUpManager implementation to HeadsUpManagerPhone (2nd try)"
OSDN Git Service
