OSDN Git Service
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
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
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
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
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
Android Build Merger (Role) [Fri, 27 May 2016 03:14:18 +0000 (03:14 +0000)]
Merge "Merge "Time to #NameAndroidN!" into nyc-dev am:
45caebe035" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 27 May 2016 03:14:09 +0000 (03:14 +0000)]
Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am:
d6ee899397" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 27 May 2016 03:14:02 +0000 (03:14 +0000)]
Merge "Merge "Careful process validation for unaware providers." into nyc-dev am:
678dba737b" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 27 May 2016 03:13:54 +0000 (03:13 +0000)]
Merge "Defer calling the stack task removed callbacks. am:
6c8217ab30" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 27 May 2016 03:13:44 +0000 (03:13 +0000)]
Merge changes from topic 'am-
e4ceb878ab564c70a4e1726ee7c0709a' into nyc-mr1-dev
* changes:
Merge "Suppress unlock notifications on non-FBE devices." into nyc-dev am:
a39d888651
Merge "Replace caribou wallpaper without the stars b/
28339724" into nyc-dev am:
b3d4ad2205
Android Build Merger (Role) [Fri, 27 May 2016 03:13:31 +0000 (03:13 +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
Dan Sandler [Fri, 27 May 2016 03:12:50 +0000 (03:12 +0000)]
Merge "Time to #NameAndroidN!" into nyc-dev
am:
45caebe035
* commit '
45caebe035a67db18d06c4f4e4f124246fb5321d':
Time to #NameAndroidN!
Change-Id: Iecedefbae64d4a6ffb67971be0f9da5eb746b1ed
Jeff Sharkey [Fri, 27 May 2016 03:12:31 +0000 (03:12 +0000)]
Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev
am:
d6ee899397
* commit '
d6ee8993973050befff3a5f10f273ef9e8a050e2':
Delay PACKAGE_RESTARTED until after data cleared.
Change-Id: I8bb3f31a6de42da81a44c9aaf121769ed96b6a3b
Jeff Sharkey [Fri, 27 May 2016 03:12:15 +0000 (03:12 +0000)]
Merge "Careful process validation for unaware providers." into nyc-dev
am:
678dba737b
* commit '
678dba737bed94eb5eeeed63db74aa811ee896cb':
Careful process validation for unaware providers.
Change-Id: I7856be9d44587869ee73533072aaf26d8a7908ab
Winson [Fri, 27 May 2016 03:11:47 +0000 (03:11 +0000)]
Defer calling the stack task removed callbacks.
am:
6c8217ab30
* commit '
6c8217ab3072fa65851316a922b482506b3c2a4c':
Defer calling the stack task removed callbacks.
Change-Id: Icf53cc0628c98293b3a2d4ab28d95e54ee93f248
Jeff Sharkey [Fri, 27 May 2016 03:11:06 +0000 (03:11 +0000)]
Merge "Suppress unlock notifications on non-FBE devices." into nyc-dev
am:
a39d888651
* commit '
a39d888651493d20f3814cd88a39a521450b3eac':
Suppress unlock notifications on non-FBE devices.
Change-Id: I9e17a23b0f3127ac5ae0f08cbf0a6c306aaba9d5
Hyunyoung Song [Fri, 27 May 2016 03:08:58 +0000 (03:08 +0000)]
Merge "Replace caribou wallpaper without the stars b/
28339724" into nyc-dev
am:
b3d4ad2205
* commit '
b3d4ad220598beffb30ac4cd44741ff19da2c57a':
Replace caribou wallpaper without the stars b/
28339724
Change-Id: I8062526bf7ba313e924621cf6a16ceb738e72d72
TreeHugger Robot [Fri, 27 May 2016 03:08:37 +0000 (03:08 +0000)]
Merge "Properly check if BT is off when shutting down radios" into nyc-mr1-dev
Eric Schmidt [Fri, 27 May 2016 03:08:38 +0000 (03:08 +0000)]
Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am:
8e08dbe8f8 am:
400aed3556
am:
28bdf2907a
* commit '
28bdf2907aa5448f455475fde399870c22c4180a':
docs: Removing CLI steps in getting started docs
Change-Id: Iaf0135b79c79cb299055096091bc1519527ab1b7
Julia Reynolds [Fri, 27 May 2016 03:06:10 +0000 (03:06 +0000)]
Merge "Unlocked access of mServices is bad." into nyc-dev
am:
d9599faf6b
* commit '
d9599faf6b872fb5e1db72f7239b21d05050bd47':
Unlocked access of mServices is bad.
Change-Id: I84a2e07aa57e5e25ac1190b4dbfa4005c6d1e572
Julia Reynolds [Fri, 27 May 2016 03:05:42 +0000 (03:05 +0000)]
Merge "Reset slider animator on density change" into nyc-dev
am:
d52a81eeae
* commit '
d52a81eeae2b9b8425a75ee8906ed7b94b5c471a':
Reset slider animator on density change
Change-Id: I75012bd5af8ae07e5917fbffbc18cf1120e09ebc
Fyodor Kupolov [Fri, 27 May 2016 03:05:20 +0000 (03:05 +0000)]
Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev
am:
a4dbdaf5e9
* commit '
a4dbdaf5e96273dccd474e31700d84a1ad907503':
Remove ActivityManager calls with PM.mInstallLock held
Change-Id: I3be800fc5de9fa3c06f0bf6158a0dbf2a05b165e
smain@google.com [Fri, 27 May 2016 03:05:00 +0000 (03:05 +0000)]
add redirect for Espresso Test Recorder doc that will soon be on TAC site. am:
8f60544180 am:
e1bd7e15c5
am:
5d3ca78d3f
* commit '
5d3ca78d3f561e98ae67cf97caa58a4e9e2ed5cd':
add redirect for Espresso Test Recorder doc that will soon be on TAC site.
Change-Id: I339dffae3b9532699c558d406b03a32dabae6517
Paul Jensen [Fri, 27 May 2016 03:04:34 +0000 (03:04 +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
* commit '
50615e498e11f356ef582af0f9616945d04faa80':
Don't pass URL path and username/password to PAC scripts
Change-Id: I2197af29029456780438123c59214c3d8c58a6ef
Christopher Tate [Fri, 27 May 2016 02:58:27 +0000 (02:58 +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
* commit '
d39c0a8d775988bfbf319777b2a17af1579b531a':
DO NOT MERGE : backport of backup transport whitelist
Change-Id: Icd0546a4c3d1e01b356958b78ba143e44061515e
Teng-Hui Zhu [Fri, 27 May 2016 02:50:14 +0000 (02:50 +0000)]
Merge "Update the light center when the root view\'s layout changed" into nyc-dev
am:
e78ba24c17
* commit '
e78ba24c176fd6a0c54eaf7e52be545952ba1ab7':
Update the light center when the root view's layout changed
Change-Id: Ic973b9b47df6550c5170c2248c7e0f2ab25c6a57
Phil Burk [Fri, 27 May 2016 02:49:44 +0000 (02:49 +0000)]
Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev
am:
d34d06606d
* commit '
d34d06606dd5be9fc18029e87cb4b56ecef21864':
AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY
Change-Id: I3c7741fcf914f4e2f6cf89eaec2d72ba519a24b1
Rubin Xu [Fri, 27 May 2016 02:48:59 +0000 (02:48 +0000)]
Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev
am:
1ad12e0678
* commit '
1ad12e0678e87e2ed64dcbc878ee2c7136b5ccdb':
Elaborate on requirement to support PreRebootSecurityLogs
Change-Id: I088c0a0980517d3b4ffa6fe1b1aa9add7620c6e0
Bill Yi [Fri, 27 May 2016 02:47:12 +0000 (02:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
9aed8c2fa0 -s ours
* commit '
9aed8c2fa01785be20cd7cc07976670812bc84a0':
Import translations. DO NOT MERGE
Change-Id: I0305b137eed7ecf9e4b149a0f589e658de16811f
Bill Yi [Fri, 27 May 2016 02:46:32 +0000 (02:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
cb8c569414 -s ours
* commit '
cb8c569414121158adb2a627d4a91b47dd3c4362':
Import translations. DO NOT MERGE
Change-Id: I6ed4074aea21921c930baa71f5564b7dd847618e
Julia Reynolds [Fri, 27 May 2016 02:43:28 +0000 (02:43 +0000)]
Merge "Importance slider updates." into nyc-dev
am:
2bf73e94c3
* commit '
2bf73e94c389bf9457df132d6eaf294f9d35587f':
Importance slider updates.
Change-Id: Ia9d063f6422259f80aeee6fe2d27ca1354538955
Jeff Sharkey [Fri, 27 May 2016 02:42:44 +0000 (02:42 +0000)]
Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev
am:
36cbf5ca37
* commit '
36cbf5ca378523bfa4f5394e39f5fcff2b2461de':
Cache IMountService for isUserKeyUnlocked() calls.
Change-Id: I1ad2d1eba64a89e7a22dc86c7241f6f85a5f2a0b
Jason Monk [Fri, 27 May 2016 02:42:04 +0000 (02:42 +0000)]
Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev
am:
72f19ff6f0
* commit '
72f19ff6f057fff184c875194e802005f8e8fd08':
QS: Make hotspot go unavailable in airplane mode
Change-Id: Ia21b21a840106fcbd7ca534ee639f43c0487a396
Robin Lee [Fri, 27 May 2016 02:39:45 +0000 (02:39 +0000)]
Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev
am:
33154deb70
* commit '
33154deb700a8cf5df6fff39f0b3291d1278efa0':
Check if we're connected before marking a UID blocked
Change-Id: I7a2552f43c66b1b1adb094d3b91ef87648e57bde
Chris Wren [Fri, 27 May 2016 02:28:03 +0000 (22:28 -0400)]
resolve merge conflicts of
0f97b8f to nyc-mr1-dev
Change-Id: I5e03144e3ae95777eb651add098eabe8af6ad08e
Fyodor Kupolov [Fri, 27 May 2016 00:48:37 +0000 (00:48 +0000)]
Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev
Chris Wren [Thu, 26 May 2016 23:16:27 +0000 (23:16 +0000)]
Merge "boost starred people to at least high importance" into nyc-dev
am:
8e5d7413b8
* commit '
8e5d7413b85a7b202bc917eee4287762b13b864b':
boost starred people to at least high importance
Change-Id: I40d102f3534558894056b2048c629ca955975ca2
Chris Tate [Thu, 26 May 2016 22:32:44 +0000 (22:32 +0000)]
Merge "Use backstop timeouts on asynchronous countdown during preflight" into nyc-dev
Jorim Jaggi [Wed, 25 May 2016 21:14:46 +0000 (14:14 -0700)]
Fix toast with accessibility and app pinning
Bug:
28912468
Change-Id: Ica33ba691bbcb921c5d3e953890498c04bb624e3
George Mount [Thu, 26 May 2016 22:15:31 +0000 (22:15 +0000)]
Merge "Fix Activity Transition mess-up." into nyc-dev
Wyatt Riley [Thu, 26 May 2016 22:03:25 +0000 (22:03 +0000)]
Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev
Alan Viverette [Thu, 26 May 2016 21:20:01 +0000 (21:20 +0000)]
Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev
Alan Viverette [Thu, 26 May 2016 20:49:29 +0000 (16:49 -0400)]
Prevent callbacks during DrawableContainer child initialization
Bug:
28900939
Change-Id: I9c6c8af1665c2dc0bfa8bc8fc773c81e14f6aab1
Winson Chung [Thu, 26 May 2016 20:39:27 +0000 (20:39 +0000)]
Merge "Fixing crash in SysUI due to invalid group." into nyc-dev
Christine Hallstrom [Wed, 25 May 2016 22:49:08 +0000 (15:49 -0700)]
Properly check if BT is off when shutting down radios
Use BluetoothAdapter#getState() instead of
BluetoothAdapter#isEnabled() when checking if Bluetooth has turned
off, as isEnabled() is set to false early in the shutdown process
and getState() provides a better indication of the state of BT.
Bug:
27354612
Change-Id: Ic7828f0726491d49c9a14ba5d654b24f66743662
Daniel Sandler [Thu, 26 May 2016 20:07:08 +0000 (20:07 +0000)]
Merge "Time to #NameAndroidN!" into nyc-dev
Jeff Sharkey [Thu, 26 May 2016 20:04:14 +0000 (20:04 +0000)]
Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev
Jeff Sharkey [Thu, 26 May 2016 20:03:40 +0000 (20:03 +0000)]
Merge "Careful process validation for unaware providers." into nyc-dev
Winson [Thu, 26 May 2016 17:46:11 +0000 (10:46 -0700)]
Fixing crash in SysUI due to invalid group.
- Adding a null check for tasks that have already been removed, but may
be launched.
Bug:
28890599
Change-Id: Idde322c737a5543e639e693fbe7615e720a12c1e
Winson [Wed, 25 May 2016 17:53:53 +0000 (10:53 -0700)]
Defer calling the stack task removed callbacks.
- When updating a TaskStack, defer calling any callbacks until the stack
is updated. Otherwise, the handler may incorrectly check the size of
the stack to be empty, which triggers Recents to go home.
- This CL also removes an erroneous double call to onStackTaskRemoved()
when updating, one explicit call and the call that is made internally
in removeTask().
Bug:
28941269
Change-Id: I37b93bd959a625096925a16a426269a0c79de4e7
Jeff Sharkey [Thu, 26 May 2016 19:53:16 +0000 (19:53 +0000)]
Merge "Suppress unlock notifications on non-FBE devices." into nyc-dev
Adam Cohen [Thu, 26 May 2016 19:44:22 +0000 (19:44 +0000)]
Merge "Replace caribou wallpaper without the stars b/
28339724" into nyc-dev
Eric Schmidt [Thu, 26 May 2016 19:35:13 +0000 (19:35 +0000)]
Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am:
8e08dbe8f8
am:
400aed3556
* commit '
400aed3556d837e746252e1be03dd1ac54a383e5':
docs: Removing CLI steps in getting started docs
Change-Id: Id585f59925373bda46a34c9bd6811603ea5ee66a
Eric Schmidt [Thu, 26 May 2016 19:30:14 +0000 (19:30 +0000)]
Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs
am:
8e08dbe8f8
* commit '
8e08dbe8f825e2de9cd79bf155a255543efb4c6c':
docs: Removing CLI steps in getting started docs
Change-Id: If7ce2cdf3f9b27dd8f7ab36a83fe38d26a70e7ca
Eric Schmidt [Thu, 26 May 2016 19:26:31 +0000 (19:26 +0000)]
Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs
Eric Schmidt [Tue, 24 May 2016 22:50:59 +0000 (15:50 -0700)]
docs: Removing CLI steps in getting started docs
Bug:
22875456
Bug:
21026809
Change-Id: I8f4fcca73c779407aac0b96299c60f8d6adae214
Julia Reynolds [Thu, 26 May 2016 18:46:38 +0000 (18:46 +0000)]
Merge "Unlocked access of mServices is bad." into nyc-dev
Julia Reynolds [Thu, 26 May 2016 18:46:09 +0000 (18:46 +0000)]
Merge "Reset slider animator on density change" into nyc-dev
Jonathan Basseri [Thu, 26 May 2016 18:41:17 +0000 (11:41 -0700)]
resolve merge conflicts of
4c04097 to nyc-mr1-dev
Change-Id: I256514588af20985108f72a5e204811904f87c9c
Fyodor Kupolov [Thu, 26 May 2016 18:20:35 +0000 (18:20 +0000)]
Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev
smain@google.com [Thu, 26 May 2016 18:05:08 +0000 (18:05 +0000)]
add redirect for Espresso Test Recorder doc that will soon be on TAC site. am:
8f60544180
am:
e1bd7e15c5
* commit '
e1bd7e15c5958769025ba5c8bbf0d18d8e9bfb20':
add redirect for Espresso Test Recorder doc that will soon be on TAC site.
Change-Id: I9a5f32d1828970a96dea0a31e62e1b80f564fed4
Jeff Sharkey [Thu, 26 May 2016 17:02:28 +0000 (11:02 -0600)]
Delay PACKAGE_RESTARTED until after data cleared.
Some system internals are using the PACKAGE_RESTARTED broadcast to
rebind to services, which would fail if the package was still frozen
due to a long-running clear data operation. To avoid this, delay both
the PACKAGE_RESTARTED and PACKAGE_DATA_CLEARED broadcasts until after
the clear operation has finished.
Bug:
28964281
Change-Id: I18ac36c39ba90498b1eb0cc495da1f16c24614bf
Jeff Sharkey [Wed, 25 May 2016 17:06:20 +0000 (11:06 -0600)]
Careful process validation for unaware providers.
When unlocking a user, install any direct boot unaware providers into
processes that were started before unlock. Mirror the conditional
logic used in all other provider locations.
Bug:
28708253
Change-Id: I2044558456d7f8e509374659f7c89abf01869cd9
Paul Jensen [Thu, 26 May 2016 17:59:23 +0000 (17:59 +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
* commit '
94c8855da6c1e5800723d1eaeceb1cba841bea6b':
Don't pass URL path and username/password to PAC scripts
Change-Id: Ic91dc5c4a0a283bcd177daac8cced12a668bf0d9
smain@google.com [Thu, 26 May 2016 17:59:11 +0000 (17:59 +0000)]
add redirect for Espresso Test Recorder doc that will soon be on TAC site.
am:
8f60544180
* commit '
8f60544180374beaab837bc0f3225e54d0d368a5':
add redirect for Espresso Test Recorder doc that will soon be on TAC site.
Change-Id: I55f32372b245d136519e55e8dd79796f58a6231f
Christopher Tate [Thu, 26 May 2016 17:56:38 +0000 (17:56 +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
* commit '
0905c8f3989ab607b659fdc20a1b9a56794d2b6f':
DO NOT MERGE : backport of backup transport whitelist
Change-Id: I6d0b878ea43d98761b93865604e8cb97410cdea9
Julia Reynolds [Thu, 26 May 2016 17:49:17 +0000 (13:49 -0400)]
Unlocked access of mServices is bad.
Change-Id: I626d2daffb3669c7bea4856f8ee66dbd13951163
Fixes:
28979051
Tenghui Zhu [Thu, 26 May 2016 17:48:48 +0000 (17:48 +0000)]
Merge "Update the light center when the root view's layout changed" into nyc-dev
Phil Burk [Thu, 26 May 2016 17:46:07 +0000 (17:46 +0000)]
Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev
Julia Reynolds [Thu, 26 May 2016 17:43:38 +0000 (13:43 -0400)]
Reset slider animator on density change
Change-Id: Iae7d32746c6ea2cabe7d0d58ff11a05d1722fce4
Fixes:
28626591
Phil Burk [Wed, 25 May 2016 22:13:57 +0000 (15:13 -0700)]
AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY
Explain buffer size optimization.
This CL has no code changes, just documentation changes.
Bug:
28802853
Change-Id: I91942f00a3e9691e4fc05b24656b8bf4cb538bc2
Signed-off-by: Phil Burk <philburk@google.com>
smain@google.com [Thu, 26 May 2016 17:33:07 +0000 (10:33 -0700)]
add redirect for Espresso Test Recorder doc that will soon be on TAC site.
Change-Id: Ied13eedb15940b4a52562beffc9ea7652a0c4c76
Doris Ling [Thu, 26 May 2016 17:20:53 +0000 (17:20 +0000)]
Merge "Added new action for gesture settings." into nyc-mr1-dev
Manoja Wijewardene [Thu, 26 May 2016 17:20:48 +0000 (17:20 +0000)]
Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 17:07:54 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 17:07:23 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
George Mount [Thu, 26 May 2016 16:52:53 +0000 (09:52 -0700)]
Fix Activity Transition mess-up.
Bug
28610520
isTopOfTask() was returns false in onResume always because
it wasn't being made visible until after onResume. The visibility
of the window is not important for this method (older versions
didn't check it at all), so that was removed.
Change-Id: I45e506e72356cc3808e2e9340739726c99da7d97
TreeHugger Robot [Thu, 26 May 2016 16:56:12 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 16:55:57 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Julia Reynolds [Thu, 26 May 2016 16:50:56 +0000 (16:50 +0000)]
Merge "Importance slider updates." into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 16:49:49 +0000 (16:49 +0000)]
Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev
Dan Sandler [Thu, 26 May 2016 03:13:32 +0000 (23:13 -0400)]
Time to #NameAndroidN!
Bug:
27376882
Change-Id: I32397e634039a64b86669662908fab2effb367a7
Jason Monk [Thu, 26 May 2016 16:46:47 +0000 (16:46 +0000)]
Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev
Robin Lee [Thu, 26 May 2016 16:42:16 +0000 (16:42 +0000)]
Merge "Check if we're connected before marking a UID blocked" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 16:35:28 +0000 (16:35 +0000)]
Merge "add metrics for notification and group expansion" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 16:35:20 +0000 (16:35 +0000)]
Merge "boost starred people to at least high importance" into nyc-dev
Ji Yang [Thu, 26 May 2016 15:54:27 +0000 (15:54 +0000)]
Merge "Rename carrier messaging API constant." into nyc-dev
am:
f7375b46ff
* commit '
f7375b46ff9848feba0a9632669d07384954d69e':
Rename carrier messaging API constant.
Change-Id: I0e6713e07899cde7780b433c0f3053e344e6d327
Jonathan Basseri [Thu, 26 May 2016 15:50:03 +0000 (15:50 +0000)]
Merge "Change how TelephonyManager handles subscriptions." into nyc-dev
Jeff Sharkey [Thu, 26 May 2016 15:47:43 +0000 (09:47 -0600)]
Suppress unlock notifications on non-FBE devices.
We have a longer-term plan to clean up FBE unlock notifications, but
in the meantime don't confuse users by quickly flashing them on
non-FBE devices.
Bug:
28840764
Change-Id: I696508ef981b6f8f51f22ea24487d87d27d5b6e3
Ji Yang [Thu, 26 May 2016 15:40:11 +0000 (15:40 +0000)]
Merge "Rename carrier messaging API constant." into nyc-dev
Jeff Sharkey [Thu, 26 May 2016 15:31:04 +0000 (09:31 -0600)]
Cache IMountService for isUserKeyUnlocked() calls.
This avoids doing a ServiceManager lookup for every call through
this hot code-path.
Bug:
28946245
Change-Id: I210ce34b33e5b40a5ab4e92ddce87fc5e9964be2
Robin Lee [Tue, 24 May 2016 15:35:10 +0000 (16:35 +0100)]
Check if we're connected before marking a UID blocked
This kills the always-on test, and any third-party app that correctly
checks whether it's blocked before attempting to make a connection.
Only affects always-on VPN when lockdown=true.
Bug:
28909500
Change-Id: I87aa9598d3872ae2ec409c2b19d73052c21ec878
Paul Jensen [Thu, 26 May 2016 15:22:55 +0000 (15:22 +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
* commit '
7ff57eaff95fd4cdb3cc80f8e420b469f0656bb8':
Don't pass URL path and username/password to PAC scripts
Change-Id: I80187f003e437678786f0740f23e76543890b9bc
Paul Jensen [Thu, 26 May 2016 15:13:07 +0000 (15:13 +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
* commit '
a5a2c88fb3ac43315575de94696c837cb6b88c35':
Don't pass URL path and username/password to PAC scripts
Change-Id: Ia33d40ae5d4b6ee0cd3cfcdc8587d6002603f128
Julia Reynolds [Thu, 26 May 2016 15:07:49 +0000 (11:07 -0400)]
Importance slider updates.
Icon & tint.
Bug:
28911161
Change-Id: Id8c3a4b79326eb5073a600de49ac14ae7223b398
Paul Jensen [Thu, 26 May 2016 15:02:46 +0000 (15:02 +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
* commit '
54a62d5febc8771f65221db3dd5c6e08f3288eb8':
Don't pass URL path and username/password to PAC scripts
Change-Id: I1da24c02fbf85a7f0fd3ea7a86ad3a34389000e8
Jason Monk [Wed, 25 May 2016 18:22:01 +0000 (14:22 -0400)]
QS: Make hotspot go unavailable in airplane mode
Put the hotspot tile in the unavailable state whenever airplane
mode is on.
Change-Id: I7a6eb54c2e89a7a9736c72d8e58ab58e7e82d0a6
Fixes:
28881032
Paul Jensen [Thu, 26 May 2016 14:50:37 +0000 (14:50 +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
* commit '
7c625e1938f28cf2a455fb1f4ab71dca99341b3d':
Don't pass URL path and username/password to PAC scripts
Change-Id: If2e068e47e6efd4b8ad7abc7fb358860b188a380
Michael Wright [Thu, 26 May 2016 14:38:56 +0000 (14:38 +0000)]
Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev
am:
c396f0f70e
* commit '
c396f0f70ef40ea0fb42a0872a13f4c4e9a6a5f0':
DO NOT MERGE Remove Pointer Capture API
Change-Id: I77cb742feacdd3b8af0cf33d4e7ab246f776417f