OSDN Git Service
Ian Rogers [Fri, 27 May 2016 21:31:19 +0000 (14:31 -0700)]
Fix SuppressWarnings typo.
As Error Prone states:
Suppressing "deprecated" is probably a typo for "deprecation"
Bug:
27723540
Change-Id: Iedc8ef3b876f5238cc0e2d89d57138eafd5bf91f
The Android Automerger [Fri, 27 May 2016 20:05:56 +0000 (20:05 +0000)]
Merge commit '
93c1d3aa6e20b52a37548af0bf9f9a66948a7611'
* commit '
93c1d3aa6e20b52a37548af0bf9f9a66948a7611':
docs: Refinements for testing
Fix toast with accessibility and app pinning
Updated link to material design page.
Change overdraw test to use windowbackground
Prevent callbacks during DrawableContainer child initialization
Fixing crash in SysUI due to invalid group.
Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page.
Fix Activity Transition mess-up.
Time to #NameAndroidN!
Prevent use of a null sCallbackObj by Hardware FLP
Fixed the relative time spoken with accessibility
Use backstop timeouts on asynchronous countdown during preflight
Bill Yi [Fri, 27 May 2016 19:53:31 +0000 (19:53 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am:
9aed8c2fa0 -s ours am:
9f2ffbcd66 -s ours" into nyc-mr1-dev-plus-aosp
am:
d5eb34ad35 -s ours
* commit '
d5eb34ad35d5a95095a2fce794e7680c0e7c58a7':
Change-Id: Icb4aa1fe9e891e2fb4570349e5ab427d635feca7
Bill Yi [Fri, 27 May 2016 19:48:49 +0000 (19:48 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am:
cb8c569414 -s ours am:
8272bb6af4 -s ours" into nyc-mr1-dev-plus-aosp
am:
902c693bae -s ours
* commit '
902c693bae6c3f432dd72f3b55680e13632bf928':
Change-Id: Iadd1aa8f179fec25ff8a9b0ef72698c2fd847b30
Jeff Sharkey [Fri, 27 May 2016 19:44:13 +0000 (19:44 +0000)]
Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am:
d6ee899397" into nyc-mr1-dev am:
4e8b6bfe69
am:
d948e39e94
* commit '
d948e39e949c939f2f26fb95bfd1dbacea60493c':
Delay PACKAGE_RESTARTED until after data cleared.
Change-Id: I5bf677218fe3ee19eb667f708d6220c7e82736ee
Jeff Sharkey [Fri, 27 May 2016 19:38:39 +0000 (19:38 +0000)]
Merge "Merge "Careful process validation for unaware providers." into nyc-dev am:
678dba737b" into nyc-mr1-dev am:
37b78dcdd7
am:
a822d4e73a
* commit '
a822d4e73af571a44f73da6701beb0966eb4c5b9':
Careful process validation for unaware providers.
Change-Id: Id1a9171c660ac2b9266cb36bdda03c1e235dfcdb
Winson [Fri, 27 May 2016 19:33:09 +0000 (19:33 +0000)]
Merge "Defer calling the stack task removed callbacks. am:
6c8217ab30" into nyc-mr1-dev am:
e351f281ef
am:
99a36a841a
* commit '
99a36a841aa50bc727e37cc7df4bc0d4be29dca6':
Defer calling the stack task removed callbacks.
Change-Id: I65e07e8fa366ea6781654b7bee4799f0ae3b35d8
Jeff Sharkey [Fri, 27 May 2016 19:26:38 +0000 (19:26 +0000)]
Merge changes from topic \'am-
e4ceb878ab564c70a4e1726ee7c0709a\' into nyc-mr1-dev am:
0ce1648f01
am:
68f4e9fbb2
* commit '
68f4e9fbb21d69e963bec22fd4c50721b3e400f9':
Suppress unlock notifications on non-FBE devices.
Replace caribou wallpaper without the stars b/
28339724
Change-Id: I2591d99120519c1850405bafccf88312418fa31d
Eric Schmidt [Fri, 27 May 2016 19:22:03 +0000 (19:22 +0000)]
Merge "Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am:
8e08dbe8f8 am:
400aed3556 am:
28bdf2907a" into nyc-mr1-dev am:
b5cb2ff00a
am:
eacf998c56
* commit '
eacf998c561a5342fb104c4e478abb3e0df969f1':
docs: Removing CLI steps in getting started docs
Change-Id: I8ecffa630d71b9578cba814c5006c61e8e0c36ac
Christine Hallstrom [Fri, 27 May 2016 19:17:03 +0000 (19:17 +0000)]
Merge "Properly check if BT is off when shutting down radios" into nyc-mr1-dev am:
0f760e0815
am:
fa72d4caff
* commit '
fa72d4caffce6f1b7adf5e04f8643fc8e2ebb243':
Properly check if BT is off when shutting down radios
Change-Id: I16d921e8aac53b21c4007e697dc4d5e2f2a4fa4f
Julia Reynolds [Fri, 27 May 2016 19:12:04 +0000 (19:12 +0000)]
Merge "Unlocked access of mServices is bad." into nyc-dev am:
d9599faf6b am:
c2813e2501
am:
60453d14ad
* commit '
60453d14ad737b7bdb77cf8204dcb1450bc3b0c0':
Unlocked access of mServices is bad.
Change-Id: Iaa4cdffe47be29eb9e4f2302c78d38fb2a97176e
Julia Reynolds [Fri, 27 May 2016 19:08:46 +0000 (19:08 +0000)]
Merge "Reset slider animator on density change" into nyc-dev am:
d52a81eeae am:
0e64814c7d
am:
df5072d152
* commit '
df5072d1524b9f4c74366371efded596a8982d5e':
Reset slider animator on density change
Change-Id: I838c804b378147f9adb9a3ee50e1e61dffd1bc25
Fyodor Kupolov [Fri, 27 May 2016 17:50:31 +0000 (17:50 +0000)]
Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev am:
a4dbdaf5e9 am:
5d531e4f6c
am:
f6816ad3c5
* commit '
f6816ad3c5b4062ebe8cdb810aee70e9c9a34314':
Remove ActivityManager calls with PM.mInstallLock held
Change-Id: I98ea0d1c547c5f044bf7fc9c231e7f19b6c39c95
smain@google.com [Fri, 27 May 2016 17:45:41 +0000 (17:45 +0000)]
add redirect for Espresso Test Recorder doc that will soon be on TAC site. am:
8f60544180 am:
e1bd7e15c5 am:
5d3ca78d3f am:
b35e6f9ad7
am:
38466617c1
* commit '
38466617c14f9af8f86224d2be96587509e157f0':
add redirect for Espresso Test Recorder doc that will soon be on TAC site.
Change-Id: I2fb7ecb556d77e5de94f4971650eefbd46cef258
Paul Jensen [Fri, 27 May 2016 17:42:22 +0000 (17:42 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff am:
8940d2b0ff am:
bb27626141 am:
6c35cf2434 am:
42a5983364 am:
75095e6f02 am:
7c625e1938 am:
54a62d5feb am:
a5a2c88fb3 am:
7ff57eaff9 am:
94c8855da6 am:
50615e498e am:
fdc53e96d3
am:
257c5b2e9c
* commit '
257c5b2e9ce5969e22c88d84213f394953740c64':
Don't pass URL path and username/password to PAC scripts
Change-Id: If9f1006bd7d4ab2acc3ce3e75a0746f6ca44b01a
Christopher Tate [Fri, 27 May 2016 17:37:42 +0000 (17:37 +0000)]
DO NOT MERGE : backport of backup transport whitelist am:
647cb6a6d8 -s ours am:
077534b101 am:
4c559cdade am:
24ceca96af -s ours am:
88c9eae886 am:
1fa817c057 am:
040cf14047 am:
0905c8f398 -s ours am:
d39c0a8d77 am:
50aa0324c9
am:
4f34e793b3 -s ours
* commit '
4f34e793b3359b9b880f539680a43a7d937a1983':
DO NOT MERGE : backport of backup transport whitelist
Change-Id: I823126bff0c3bd5e8bd38988634d5d68fdcb57b4
Julia Reynolds [Fri, 27 May 2016 17:31:17 +0000 (17:31 +0000)]
Merge "Merge "Importance slider updates." into nyc-dev am:
2bf73e94c3 am:
901bdeadef" into nyc-mr1-dev-plus-aosp
am:
f9db0e0cf3
* commit '
f9db0e0cf3e27e90dff8036da9627d0210a53fb2':
Change-Id: I6b5a8a29a2ba6cbd3c821e6de6d0f7c675785bac
Tenghui Zhu [Fri, 27 May 2016 17:24:49 +0000 (17:24 +0000)]
Merge "Merge "Update the light center when the root view\'s layout changed" into nyc-dev am:
e78ba24c17 am:
56d4dae9ec" into nyc-mr1-dev-plus-aosp
am:
d09ad72e82
* commit '
d09ad72e82c9ca66eea4e2409589813e20d9a8bf':
Update the light center when the root view's layout changed
Change-Id: Ifb58bf9a0a0e3b11d9c59d2c04218d63c294f0ae
Jeff Sharkey [Fri, 27 May 2016 17:19:55 +0000 (17:19 +0000)]
Merge "Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev am:
36cbf5ca37 am:
6843da1aa8" into nyc-mr1-dev-plus-aosp
am:
2cffcf29ce
* commit '
2cffcf29ce961c603543959d1ead423cb260d296':
Change-Id: I22cb6b1d5f1727433d2d10a3e34cb1df1d63fa02
Phil Burk [Fri, 27 May 2016 17:14:11 +0000 (17:14 +0000)]
Merge "Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev am:
d34d06606d am:
29e8879307" into nyc-mr1-dev-plus-aosp
am:
380221f94f
* commit '
380221f94f528a8acd684626c5130b5a51a92044':
AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY
Change-Id: I03cb23c0c7820ec481e26a34b49940a738405d26
Jason Monk [Fri, 27 May 2016 17:09:38 +0000 (17:09 +0000)]
Merge "Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev am:
72f19ff6f0 am:
b59383a375" into nyc-mr1-dev-plus-aosp
am:
2122328c75
* commit '
2122328c7577a6fe519fbc48943aae4303e03540':
Change-Id: Id942146a41e33fb549cbcaca3eb8253433357644
Manoja Wijewardene [Fri, 27 May 2016 17:04:50 +0000 (17:04 +0000)]
Merge "Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev am:
1ad12e0678 am:
d667ff5930" into nyc-mr1-dev-plus-aosp
am:
d9c7414bf1
* commit '
d9c7414bf116adbdd6e658d1cf484f02718b63c3':
Elaborate on requirement to support PreRebootSecurityLogs
Change-Id: Ia7ac05724ced97692a9c6788f494525bedf2961f
Robin Lee [Fri, 27 May 2016 16:57:47 +0000 (16:57 +0000)]
Merge "Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev am:
33154deb70 am:
174385a208" into nyc-mr1-dev-plus-aosp
am:
b3f3f26046
* commit '
b3f3f26046103461067101e5bfb8416a4285a776':
Change-Id: I76ffb65c583312c63937f9e7d77432cadafff355
Bill Yi [Fri, 27 May 2016 16:52:47 +0000 (16:52 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am:
9aed8c2fa0 -s ours am:
02befc3229 -s ours" into nyc-mr1-dev-plus-aosp
am:
5cc2c12f29 -s ours
* commit '
5cc2c12f29e0d186da4449b8ef0c7569d01af1b7':
Import translations. DO NOT MERGE
Change-Id: I7b7fbe10fc11334a14b3044c34ee82af67515046
Chris Wren [Fri, 27 May 2016 16:47:39 +0000 (16:47 +0000)]
Merge "Merge "add metrics for notification and group expansion" into nyc-dev am:
0f97b8fcbd am:
32b50d9c39" into nyc-mr1-dev-plus-aosp
am:
88a41ca185
* commit '
88a41ca185856a5393fee54f321742a4aeeb584b':
Change-Id: I1ea836d4b07f6dfe06f272f2ae8be64b74b0a1b2
Bill Yi [Fri, 27 May 2016 16:41:41 +0000 (16:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
cb8c569414 -s ours am:
977d5bbfd2 -s ours
am:
adab7c9693 -s ours
* commit '
adab7c9693f491ebc6121c9b253dc3a1f98816db':
Import translations. DO NOT MERGE
Change-Id: Iac3290e9b655039bbbce5bdd9ac07130f870c905
Julia Reynolds [Fri, 27 May 2016 16:37:04 +0000 (16:37 +0000)]
Merge "Importance slider updates." into nyc-dev am:
2bf73e94c3 am:
19a8d034fb
am:
733245e5fb
* commit '
733245e5fb35c10a5c81f34a1064a5b0d87d34c4':
Importance slider updates.
Change-Id: I91465aca8704345dae99486d45acd5f88063c481
TreeHugger Robot [Fri, 27 May 2016 16:27:18 +0000 (16:27 +0000)]
Merge "remove character limits from usage notification strings"
TreeHugger Robot [Fri, 27 May 2016 16:17:40 +0000 (16:17 +0000)]
Merge "Use an ArrayMap instead of HashMap to track tether interfaces"
Jeff Sharkey [Fri, 27 May 2016 16:14:08 +0000 (16:14 +0000)]
Merge "resolve merge conflicts of
58db550 to master"
Tenghui Zhu [Fri, 27 May 2016 16:13:44 +0000 (16:13 +0000)]
Merge "Initial setup Java level graphics perf test"
Jeff Sharkey [Fri, 27 May 2016 16:12:55 +0000 (10:12 -0600)]
resolve merge conflicts of
58db550 to master
Change-Id: I39f7760c008af1d4a107b6b929b44c79d2f463be
Chris Wren [Thu, 12 May 2016 17:20:12 +0000 (13:20 -0400)]
remove character limits from usage notification strings
Bug:
28545220
Change-Id: I759dbecc72ef439ccb7384b7b60da278795258bc
TreeHugger Robot [Fri, 27 May 2016 07:01:32 +0000 (07:01 +0000)]
Merge "Move BandController out of MultiSelectManager."
Android Build Merger (Role) [Fri, 27 May 2016 03:51:40 +0000 (03:51 +0000)]
Merge "Merge "Merge "docs: Refinements for testing" into mnc-io-docs am:
9da0730d66 am:
feb0b87230" into nyc-dev am:
3dba0fbd53 am:
d76cc5d107" into nyc-mr1-dev-plus-aosp
Bert McMeen [Fri, 27 May 2016 03:50:11 +0000 (03:50 +0000)]
Merge "Merge "docs: Refinements for testing" into mnc-io-docs am:
9da0730d66 am:
feb0b87230" into nyc-dev am:
3dba0fbd53
am:
d76cc5d107
* commit '
d76cc5d10764d8e70b06229f6290bca9cd351fe1':
docs: Refinements for testing
Change-Id: I305052f6a91abd43da83a62344ad668fe9061ed6
Android Build Merger (Role) [Fri, 27 May 2016 03:48:16 +0000 (03:48 +0000)]
Merge "Merge "Updated link to material design page. am:
ff05383baf am:
ee44b14cd4" into nyc-dev am:
3106e71ddc am:
88c6e6da0a" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:48:09 +0000 (03:48 +0000)]
Merge "Merge "Change overdraw test to use windowbackground" into nyc-dev am:
34979a3af6 am:
fa33b23ee8" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:48:00 +0000 (03:48 +0000)]
Merge "Merge "resolve merge conflicts of
7f7eec3 to nyc-dev" into nyc-dev am:
8d063a396f am:
302e608b73" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:47:51 +0000 (03:47 +0000)]
Merge "Merge "Fixed the relative time spoken with accessibility" into nyc-dev am:
38b5946fae am:
828d701667" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:47:44 +0000 (03:47 +0000)]
Merge "Merge "Use backstop timeouts on asynchronous countdown during preflight" into nyc-dev am:
210f2ff198 am:
d61bd47a0d" into nyc-mr1-dev-plus-aosp
sreevanis [Fri, 27 May 2016 03:46:54 +0000 (03:46 +0000)]
Merge "Updated link to material design page. am:
ff05383baf am:
ee44b14cd4" into nyc-dev am:
3106e71ddc
am:
88c6e6da0a
* commit '
88c6e6da0af911e718fce209ec7f550cb80549ab':
Updated link to material design page.
Change-Id: If25cf5cd7e562fbafeb6da9814dfee69691aba78
John Reck [Fri, 27 May 2016 03:46:30 +0000 (03:46 +0000)]
Merge "Change overdraw test to use windowbackground" into nyc-dev am:
34979a3af6
am:
fa33b23ee8
* commit '
fa33b23ee81d91a5c344be60039f27590ed0b194':
Change overdraw test to use windowbackground
Change-Id: Ib45ac99f10c3f511b54d1c8c5e06db141a125965
Kevin Hufnagle [Fri, 27 May 2016 03:45:52 +0000 (03:45 +0000)]
Merge "resolve merge conflicts of
7f7eec3 to nyc-dev" into nyc-dev am:
8d063a396f
am:
302e608b73
* commit '
302e608b732057d93ca2fd5941723829af3a1804':
Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page.
Change-Id: I3d547aa453a6d252d62e9851ee0f433b51873ff9
Selim Cinek [Fri, 27 May 2016 03:44:44 +0000 (03:44 +0000)]
Merge "Fixed the relative time spoken with accessibility" into nyc-dev am:
38b5946fae
am:
828d701667
* commit '
828d70166742f11740f9a953164f984a32db5fa8':
Fixed the relative time spoken with accessibility
Change-Id: I717e571849e293093e626a99e07ca307abee8f96
Chris Tate [Fri, 27 May 2016 03:44:10 +0000 (03:44 +0000)]
Merge "Use backstop timeouts on asynchronous countdown during preflight" into nyc-dev am:
210f2ff198
am:
d61bd47a0d
* commit '
d61bd47a0ddcba11aca1e504b33c687aec91ab12':
Use backstop timeouts on asynchronous countdown during preflight
Change-Id: Iab78fe56fd5d8faa3aa7b5220fa6b4d69f793325
Android Build Merger (Role) [Fri, 27 May 2016 03:43:29 +0000 (03:43 +0000)]
Merge "Merge "Unlocked access of mServices is bad." into nyc-dev am:
d9599faf6b am:
3b46f0e8a1" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:43:20 +0000 (03:43 +0000)]
Merge "Merge "Reset slider animator on density change" into nyc-dev am:
d52a81eeae am:
f031dbe7b4" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:43:12 +0000 (03:43 +0000)]
Merge "Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev am:
a4dbdaf5e9 am:
a32f7ac4a5" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:43:03 +0000 (03:43 +0000)]
Merge "add redirect for Espresso Test Recorder doc that will soon be on TAC site. am:
8f60544180 am:
e1bd7e15c5 am:
5d3ca78d3f am:
0a659f8480" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:42:55 +0000 (03:42 +0000)]
Merge changes from topic 'am-
07760a7359434d758da865299f519df1' into nyc-mr1-dev-plus-aosp
* changes:
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff am:
8940d2b0ff am:
bb27626141 am:
6c35cf2434 am:
42a5983364 am:
75095e6f02 am:
7c625e1938 am:
54a62d5feb am:
a5a2c88fb3 am:
7ff57eaff9 am:
94c8855da6 am:
50615e498e am:
aa98ab568c
DO NOT MERGE : backport of backup transport whitelist am:
647cb6a6d8 -s ours am:
077534b101 am:
4c559cdade am:
24ceca96af -s ours am:
88c9eae886 am:
1fa817c057 am:
040cf14047 am:
0905c8f398 -s ours am:
d39c0a8d77 am:
d8e548f6ea
Julia Reynolds [Fri, 27 May 2016 03:42:15 +0000 (03:42 +0000)]
Merge "Unlocked access of mServices is bad." into nyc-dev am:
d9599faf6b
am:
3b46f0e8a1
* commit '
3b46f0e8a194d35e98c29f60679b3a1a915e44dd':
Unlocked access of mServices is bad.
Change-Id: I78bbd3bb5f54b512740ce72e5168c605d2902fa5
Julia Reynolds [Fri, 27 May 2016 03:41:16 +0000 (03:41 +0000)]
Merge "Reset slider animator on density change" into nyc-dev am:
d52a81eeae
am:
f031dbe7b4
* commit '
f031dbe7b47f0af931bbc88b07edd40a3bbc7937':
Change-Id: I96d62f9bdf4d05115e080cdaddc62fa9ec76f730
Fyodor Kupolov [Fri, 27 May 2016 03:39:45 +0000 (03:39 +0000)]
Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev am:
a4dbdaf5e9
am:
a32f7ac4a5
* commit '
a32f7ac4a51ffd520968f274de6f4ec0536fa322':
Change-Id: I2597e9f1a9d38f5c5021166c1f40d3a9d78e205c
smain@google.com [Fri, 27 May 2016 03:39:11 +0000 (03:39 +0000)]
add redirect for Espresso Test Recorder doc that will soon be on TAC site. am:
8f60544180 am:
e1bd7e15c5 am:
5d3ca78d3f
am:
0a659f8480
* commit '
0a659f8480657f736b7e5c79f6d630e57140ed9e':
Change-Id: Ib0cef6d68f8d5002a0223a991ed2b30991717020
Paul Jensen [Fri, 27 May 2016 03:38:29 +0000 (03:38 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff am:
8940d2b0ff am:
bb27626141 am:
6c35cf2434 am:
42a5983364 am:
75095e6f02 am:
7c625e1938 am:
54a62d5feb am:
a5a2c88fb3 am:
7ff57eaff9 am:
94c8855da6 am:
50615e498e
am:
aa98ab568c
* commit '
aa98ab568cc3f7cba554b5bdb7fcd70a9b05ae61':
Change-Id: I2f311ce3ddb510f73c3d9e8d08991c8d5bd99a90
Android Build Merger (Role) [Fri, 27 May 2016 03:32:02 +0000 (03:32 +0000)]
Merge "Merge "Fix Activity Transition mess-up." into nyc-dev am:
bd34103c5d am:
ff0298540b" into nyc-mr1-dev-plus-aosp
Christopher Tate [Fri, 27 May 2016 03:32:02 +0000 (03:32 +0000)]
DO NOT MERGE : backport of backup transport whitelist am:
647cb6a6d8 -s ours am:
077534b101 am:
4c559cdade am:
24ceca96af -s ours am:
88c9eae886 am:
1fa817c057 am:
040cf14047 am:
0905c8f398 -s ours am:
d39c0a8d77
am:
d8e548f6ea
* commit '
d8e548f6ea5e185bd0f9e22acef9355f5307245d':
Change-Id: I25c53c4fe1a0ece0d9c20e339f26a81f5cf62d78
George Mount [Fri, 27 May 2016 03:31:31 +0000 (03:31 +0000)]
Merge "Fix Activity Transition mess-up." into nyc-dev am:
bd34103c5d
am:
ff0298540b
* commit '
ff0298540bf737853b10859b74f3b5d979b2fe23':
Fix toast with accessibility and app pinning
Change-Id: I05698e4b8883f31d92f627d55ae938b29e4a5818
Bert McMeen [Fri, 27 May 2016 03:31:03 +0000 (03:31 +0000)]
Merge "Merge "docs: Refinements for testing" into mnc-io-docs am:
9da0730d66 am:
feb0b87230" into nyc-dev
am:
3dba0fbd53
* commit '
3dba0fbd5388c367d00543331bc2125dd2871786':
docs: Refinements for testing
Change-Id: I8f5bb3e78336a89074c2214dfa5fa270d37cc751
Android Build Merger (Role) [Fri, 27 May 2016 03:30:47 +0000 (03:30 +0000)]
Merge "Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev am:
793ac34219 am:
8453136b8e" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:30:38 +0000 (03:30 +0000)]
Merge "Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev am:
0f1ae5fa0f am:
4e6cd80198" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:30:26 +0000 (03:30 +0000)]
Merge "Merge "Fixing crash in SysUI due to invalid group." into nyc-dev am:
814358a24f am:
d93090d916" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:30:16 +0000 (03:30 +0000)]
Merge "Merge "Merge "Time to #NameAndroidN!" into nyc-dev am:
45caebe035" into nyc-mr1-dev am:
a474cf8a90" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:30:07 +0000 (03:30 +0000)]
Merge "Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am:
d6ee899397" into nyc-mr1-dev am:
56f7a36c46" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:29:35 +0000 (03:29 +0000)]
Merge "Merge "Update the light center when the root view\'s layout changed" into nyc-dev am:
e78ba24c17 am:
b076ee0a42" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 03:29:25 +0000 (03:29 +0000)]
Merge "Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev am:
d34d06606d am:
4eccbbf926" into nyc-mr1-dev-plus-aosp
Wyatt Riley [Fri, 27 May 2016 03:29:22 +0000 (03:29 +0000)]
Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev am:
793ac34219
am:
8453136b8e
* commit '
8453136b8ee7ba361d4180df75328466292c9610':
Fix Activity Transition mess-up.
Change-Id: I3904d1d8782c07f0a869243802c1e1dc8d6e49b1
Android Build Merger (Role) [Fri, 27 May 2016 03:29:15 +0000 (03:29 +0000)]
Merge "Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev am:
1ad12e0678 am:
5ce70998d0" into nyc-mr1-dev-plus-aosp
Alan Viverette [Fri, 27 May 2016 03:29:12 +0000 (03:29 +0000)]
Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev am:
0f1ae5fa0f
am:
4e6cd80198
* commit '
4e6cd801989e5de1f13d3db1050cbd48ee5be4f2':
Prevent use of a null sCallbackObj by Hardware FLP
Change-Id: I88059295c45e5ef9091fa5a2a6b8ca7a0640f004
Android Build Merger (Role) [Fri, 27 May 2016 03:29:08 +0000 (03:29 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am:
9aed8c2fa0 -s ours am:
9f2ffbcd66 -s ours" into nyc-mr1-dev-plus-aosp
Winson Chung [Fri, 27 May 2016 03:29:03 +0000 (03:29 +0000)]
Merge "Fixing crash in SysUI due to invalid group." into nyc-dev am:
814358a24f
am:
d93090d916
* commit '
d93090d916b5c526777a57717c99800999bdf850':
Prevent callbacks during DrawableContainer child initialization
Change-Id: I54f2a3b4efc1073420dd84acff1c278c46161841
Android Build Merger (Role) [Fri, 27 May 2016 03:28:58 +0000 (03:28 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am:
cb8c569414 -s ours am:
8272bb6af4 -s ours" into nyc-mr1-dev-plus-aosp
Dan Sandler [Fri, 27 May 2016 03:28:57 +0000 (03:28 +0000)]
Merge "Merge "Time to #NameAndroidN!" into nyc-dev am:
45caebe035" into nyc-mr1-dev
am:
a474cf8a90
* commit '
a474cf8a902b111aba52318fe16d258aefae13fe':
Fixing crash in SysUI due to invalid group.
Change-Id: Id5c87e72274a5083c2cf8625ee366ed46dd9859f
Jeff Sharkey [Fri, 27 May 2016 03:28:50 +0000 (03:28 +0000)]
Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am:
d6ee899397" into nyc-mr1-dev
am:
56f7a36c46
* commit '
56f7a36c46678f596f870fbef41252eedc812150':
Time to #NameAndroidN!
Change-Id: Iec0ae063378200965d8a153308afac4edcfc9a8d
Tenghui Zhu [Fri, 27 May 2016 03:28:23 +0000 (03:28 +0000)]
Merge "Update the light center when the root view\'s layout changed" into nyc-dev am:
e78ba24c17
am:
b076ee0a42
* commit '
b076ee0a4290bc12c7eb1f959551c62448d74a81':
Change-Id: I871f9e75d10775e7851e81ac55b45e227f1858fa
sreevanis [Fri, 27 May 2016 03:28:20 +0000 (03:28 +0000)]
Merge "Updated link to material design page. am:
ff05383baf am:
ee44b14cd4" into nyc-dev
am:
3106e71ddc
* commit '
3106e71ddc6ace7bc15b50e4a91ed98ed428bee2':
Updated link to material design page.
Change-Id: Ifc6c2b1460ed0006cc83a531f41342e4a67419ef
John Reck [Fri, 27 May 2016 03:28:09 +0000 (03:28 +0000)]
Merge "Change overdraw test to use windowbackground" into nyc-dev
am:
34979a3af6
* commit '
34979a3af6dbb6e3e33a83e5cb939ea3c8c000c7':
Change overdraw test to use windowbackground
Change-Id: I33e81c72d55fb03cf40dfe173b4b14ffab09f880
Kevin Hufnagle [Fri, 27 May 2016 03:27:58 +0000 (03:27 +0000)]
Merge "resolve merge conflicts of
7f7eec3 to nyc-dev" into nyc-dev
am:
8d063a396f
* commit '
8d063a396fbce3fae74c423a181a36272ee91231':
Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page.
Change-Id: I5459f1583202ccf9567e67382a1098f3a92fc0fd
Selim Cinek [Fri, 27 May 2016 03:27:43 +0000 (03:27 +0000)]
Merge "Fixed the relative time spoken with accessibility" into nyc-dev
am:
38b5946fae
* commit '
38b5946fae50d4e9e8f32c985983d03a4437910d':
Fixed the relative time spoken with accessibility
Change-Id: I51bbe71d2b86cfb8f050882b072092a015573fdb
Phil Burk [Fri, 27 May 2016 03:27:33 +0000 (03:27 +0000)]
Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev am:
d34d06606d
am:
4eccbbf926
* commit '
4eccbbf9265a1134d870ff65ea9f7f798329bfd0':
Change-Id: Ic9a7c0b7b411ca19f09aaf2a9fa183acec5f0786
Christopher Tate [Fri, 27 May 2016 03:27:29 +0000 (03:27 +0000)]
Merge "Use backstop timeouts on asynchronous countdown during preflight" into nyc-dev
am:
210f2ff198
* commit '
210f2ff19808ce6b261a84596bf141909ecb381c':
Use backstop timeouts on asynchronous countdown during preflight
Change-Id: Id282e332a226ca4c9c2f38aef4c1f24e3003321b
Manoja Wijewardene [Fri, 27 May 2016 03:25:24 +0000 (03:25 +0000)]
Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev am:
1ad12e0678
am:
5ce70998d0
* commit '
5ce70998d014bdf3a819d3b0512925bebf9afb2c':
Change-Id: I5bd1b0ce031a34249274746e4b584c2becfde313
Bill Yi [Fri, 27 May 2016 03:24:34 +0000 (03:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
9aed8c2fa0 -s ours
am:
9f2ffbcd66 -s ours
* commit '
9f2ffbcd6674928818775002f15a1661d322aef1':
Change-Id: Idaf84d41a7aac1ed04b0abf97ca0449b53afaf89
Jorim Jaggi [Fri, 27 May 2016 03:24:20 +0000 (03:24 +0000)]
Fix toast with accessibility and app pinning
am:
cf984c56ad
* commit '
cf984c56adf88ab9d85b9a6ca71d800c2a937e6c':
Fix toast with accessibility and app pinning
Change-Id: I0c1ed9d86d6f372227a12b8f5de7f4ab0b9fd37a
Jeff Sharkey [Fri, 27 May 2016 03:24:09 +0000 (03:24 +0000)]
Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am:
d6ee899397" into nyc-mr1-dev
am:
4e8b6bfe69
* commit '
4e8b6bfe69c8dcd8706743f04f412848b9e2e345':
Delay PACKAGE_RESTARTED until after data cleared.
Change-Id: I9624930d2a00c3dac197c67d613fa7d578826035
George Mount [Fri, 27 May 2016 03:24:06 +0000 (03:24 +0000)]
Merge "Fix Activity Transition mess-up." into nyc-dev
am:
bd34103c5d
* commit '
bd34103c5defbfd180be6a387eb5aa82d4b97eac':
Fix Activity Transition mess-up.
Change-Id: I62457d504583e1865ceeace2918d81b4ef223b12
Jeff Sharkey [Fri, 27 May 2016 03:24:03 +0000 (03:24 +0000)]
Merge "Merge "Careful process validation for unaware providers." into nyc-dev am:
678dba737b" into nyc-mr1-dev
am:
37b78dcdd7
* commit '
37b78dcdd7790b758f9031976c7ca615de383c69':
Careful process validation for unaware providers.
Change-Id: Ibe3cafb6a31be30df823870e3f39dd1e31dfa75a
Winson [Fri, 27 May 2016 03:23:55 +0000 (03:23 +0000)]
Merge "Defer calling the stack task removed callbacks. am:
6c8217ab30" into nyc-mr1-dev
am:
e351f281ef
* commit '
e351f281efcf9fe30d3a39f2b471f68f2ac2a273':
Defer calling the stack task removed callbacks.
Change-Id: I1addad7ea298ad0257a5df0a4304850543ee63d1
Wyatt Riley [Fri, 27 May 2016 03:23:44 +0000 (03:23 +0000)]
Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev
am:
793ac34219
* commit '
793ac342196c57f6b89ad9d1425fc420fbb44bb5':
Prevent use of a null sCallbackObj by Hardware FLP
Change-Id: I3681a3433f21112659840fb4431f0f616305ee3c
Jeff Sharkey [Fri, 27 May 2016 03:23:40 +0000 (03:23 +0000)]
Merge changes from topic \'am-
e4ceb878ab564c70a4e1726ee7c0709a\' into nyc-mr1-dev
am:
0ce1648f01
* commit '
0ce1648f016e96cd7a496753b86d16f78795930a':
Suppress unlock notifications on non-FBE devices.
Replace caribou wallpaper without the stars b/
28339724
Change-Id: I05bc48ae343e57be43e88dafc538a3dfe77ff37a
Bill Yi [Fri, 27 May 2016 03:23:14 +0000 (03:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
cb8c569414 -s ours
am:
8272bb6af4 -s ours
* commit '
8272bb6af49a6ce8803e54c92fe63a095bb23a24':
Change-Id: I676d3e4ac37db3b933d775e6b886c9cc5a38c8d2
Eric Schmidt [Fri, 27 May 2016 03:23:08 +0000 (03:23 +0000)]
Merge "Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am:
8e08dbe8f8 am:
400aed3556 am:
28bdf2907a" into nyc-mr1-dev
am:
b5cb2ff00a
* commit '
b5cb2ff00a119870875b8f0aa2e9fd0fa49f1890':
docs: Removing CLI steps in getting started docs
Change-Id: I82373e48cac77b840c4330b37aeb10bda0da860d
Alan Viverette [Fri, 27 May 2016 03:22:53 +0000 (03:22 +0000)]
Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev
am:
0f1ae5fa0f
* commit '
0f1ae5fa0f405bc3ec040fe512f7fad86577ce9f':
Prevent callbacks during DrawableContainer child initialization
Change-Id: Ica1a228184231c5d33564968605e0a0e21a1dd0b
Winson [Fri, 27 May 2016 03:22:01 +0000 (03:22 +0000)]
Merge "Fixing crash in SysUI due to invalid group." into nyc-dev
am:
814358a24f
* commit '
814358a24f7bf045cdd8261f15aefff59936287b':
Fixing crash in SysUI due to invalid group.
Change-Id: Ib194b1041b5931483857ee57c0573277e942ec31
Christine Hallstrom [Fri, 27 May 2016 03:16:59 +0000 (03:16 +0000)]
Merge "Properly check if BT is off when shutting down radios" into nyc-mr1-dev
am:
0f760e0815
* commit '
0f760e081570cb7fe3ac7dd6a86125a8f79e5b34':
Properly check if BT is off when shutting down radios
Change-Id: I7d3b2d40664115555db897b46b3debc5b2c04f8d
Julia Reynolds [Fri, 27 May 2016 03:16:55 +0000 (03:16 +0000)]
Merge "Unlocked access of mServices is bad." into nyc-dev am:
d9599faf6b
am:
c2813e2501
* commit '
c2813e2501b9807e3e497b73ce0de11d7c502ef5':
Unlocked access of mServices is bad.
Change-Id: Ida62aad8608081cc74b9a1ab6b7a125af637ea65
Julia Reynolds [Fri, 27 May 2016 03:14:51 +0000 (03:14 +0000)]
Merge "Reset slider animator on density change" into nyc-dev am:
d52a81eeae
am:
0e64814c7d
* commit '
0e64814c7d954083d93102a645a9b44239a50408':
Reset slider animator on density change
Change-Id: I8d59a243c67a35133430cb378d76413ce6d176c1
Fyodor Kupolov [Fri, 27 May 2016 03:14:39 +0000 (03:14 +0000)]
Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev am:
a4dbdaf5e9
am:
5d531e4f6c
* commit '
5d531e4f6caedbcc2b6a9c7a549b83e37d694c7d':
Remove ActivityManager calls with PM.mInstallLock held
Change-Id: I17c8e62b0c65afe3fe58490d8e5634d9442e6821
smain@google.com [Fri, 27 May 2016 03:14:30 +0000 (03:14 +0000)]
add redirect for Espresso Test Recorder doc that will soon be on TAC site. am:
8f60544180 am:
e1bd7e15c5 am:
5d3ca78d3f
am:
b35e6f9ad7
* commit '
b35e6f9ad7ddfc88bb9897746447f685304edb99':
add redirect for Espresso Test Recorder doc that will soon be on TAC site.
Change-Id: I460a9ee98f98c13f054f63b40ab39bf7d9422988
OSDN Git Service
