Commit Graph

244006 Commits

Author SHA1 Message Date
Manoja Wijewardene
1ad12e0678 Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev 2016-05-26 17:20:49 +00:00
TreeHugger Robot
9aed8c2fa0 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-26 17:07:55 +00:00
TreeHugger Robot
cb8c569414 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-26 16:56:13 +00:00
Julia Reynolds
2bf73e94c3 Merge "Importance slider updates." into nyc-dev 2016-05-26 16:50:58 +00:00
TreeHugger Robot
36cbf5ca37 Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev 2016-05-26 16:49:51 +00:00
Jason Monk
72f19ff6f0 Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev 2016-05-26 16:46:48 +00:00
Robin Lee
33154deb70 Merge "Check if we're connected before marking a UID blocked" into nyc-dev 2016-05-26 16:42:17 +00:00
TreeHugger Robot
0f97b8fcbd Merge "add metrics for notification and group expansion" into nyc-dev 2016-05-26 16:35:29 +00:00
TreeHugger Robot
8e5d7413b8 Merge "boost starred people to at least high importance" into nyc-dev 2016-05-26 16:35:21 +00:00
Jonathan Basseri
4c04097fdb Merge "Change how TelephonyManager handles subscriptions." into nyc-dev 2016-05-26 15:50:05 +00:00
Ji Yang
f7375b46ff Merge "Rename carrier messaging API constant." into nyc-dev 2016-05-26 15:40:12 +00:00
Jeff Sharkey
4815ed4500 Cache IMountService for isUserKeyUnlocked() calls.
This avoids doing a ServiceManager lookup for every call through
this hot code-path.

Bug: 28946245
Change-Id: I210ce34b33e5b40a5ab4e92ddce87fc5e9964be2
2016-05-26 09:31:06 -06:00
Robin Lee
ebbcb54a43 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
2016-05-26 15:29:46 +00:00
Julia Reynolds
3aa969f68d Importance slider updates.
Icon & tint.

Bug: 28911161
Change-Id: Id8c3a4b79326eb5073a600de49ac14ae7223b398
2016-05-26 11:07:49 -04:00
Jason Monk
49a2796cdd 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
2016-05-26 10:57:59 -04:00
Michael Wright
c396f0f70e Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev 2016-05-26 14:03:47 +00:00
Ricky Wai
1cb6f9d8a4 Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev 2016-05-26 13:46:26 +00:00
Ricky Wai
610fb8a3f2 Merge "Store work lock type even it uses unified lock" into nyc-dev 2016-05-26 13:46:12 +00:00
Nicolas Prévot
19d34821b9 Merge "Use correct user id when checking uri grants for notification." into nyc-dev 2016-05-26 10:37:32 +00:00
Yi Kong
03a1314f2e Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev 2016-05-26 08:54:57 +00:00
Bill Yi
05930a0c1f Import translations. DO NOT MERGE
Change-Id: I20074824d92bd827a9f12d13f659d52286be1007
Auto-generated-cl: translation import
2016-05-26 00:41:49 -07:00
Lajos Molnar
40585321d7 Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev 2016-05-26 06:14:04 +00:00
Dirk Dougherty
a283dabdf5 Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a am: a7c0788467
am: 1cf99365cb

* commit '1cf99365cb98174bd4300c7f0c799e94f6aab907':
  Remove spurious url reference.

Change-Id: I744e556ebdb729314542dd9115346d42daf63e09
2016-05-26 05:44:29 +00:00
Dirk Dougherty
1cf99365cb Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a
am: a7c0788467

* commit 'a7c0788467d865e72ddbaa5862382d8ecc164039':
  Remove spurious url reference.

Change-Id: Ifb9a772d89c60124334b3a78a2f5864f879d104f
2016-05-26 05:35:46 +00:00
Dirk Dougherty
a7c0788467 Merge "Remove spurious url reference." into mnc-mr-docs
am: 1ed701493a

* commit '1ed701493a6363c58b86de8dac600fca990a131a':
  Remove spurious url reference.

Change-Id: I6b304fe5f87804f9c0d4de9bfef92437810ac9ea
2016-05-26 05:17:01 +00:00
Dirk Dougherty
1ed701493a Merge "Remove spurious url reference." into mnc-mr-docs 2016-05-26 05:03:25 +00:00
Chad Brubaker
86bceb87ca Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs am: ce99e3c571
am: 11b56641e5

* commit '11b56641e5e466f5ca14bd118e819c3f04820d38':
  Track changes to network security config manifest configuration

Change-Id: I25e463154d084223dbafdf3e2ab99bfdb52769fb
2016-05-26 04:47:44 +00:00
Joe Fernandez
68fb46153f Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am: 9e823c7048
am: 1a045584d4

* commit '1a045584d44030947793f2a48953ce54ff2df0c6':
  docs: Remove Advertising ID page and redirect to GMS reference docs

Change-Id: If2ede00cf1ab2bdb178eed09ec6f9cd6d28f8820
2016-05-26 04:47:34 +00:00
Chad Brubaker
11b56641e5 Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs
am: ce99e3c571

* commit 'ce99e3c57133b4418be4f0e2c8bc7dd9ea2815d2':
  Track changes to network security config manifest configuration

Change-Id: I6a09710dcef8b19c429f28fa90d72fd38284de3e
2016-05-26 04:37:17 +00:00
Joe Fernandez
1a045584d4 Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs
am: 9e823c7048

* commit '9e823c7048bce9373fd5ccf10003b2eb05175b2b':
  docs: Remove Advertising ID page and redirect to GMS reference docs

Change-Id: Ie5649d42ece35f36130abefd00c3a53d5252cd03
2016-05-26 04:37:09 +00:00
Android Build Merger (Role)
ce99e3c571 Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs 2016-05-26 04:26:33 +00:00
Joe Fernandez
9e823c7048 Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs 2016-05-26 04:26:25 +00:00
Chad Brubaker
094e1470d9 Merge "Track changes to network security config manifest configuration" into mnc-mr-docs
am: c0f99aebdc

* commit 'c0f99aebdc7c803600e12cbe0d940219069eb066':
  Track changes to network security config manifest configuration

Change-Id: I46fc434934428ffbdfd7816c0a3b2590f97d4713
2016-05-26 04:26:11 +00:00
Chad Brubaker
c0f99aebdc Merge "Track changes to network security config manifest configuration" into mnc-mr-docs 2016-05-26 04:09:40 +00:00
Seigo Nonaka
ce9f5e3657 Merge "Fix system locale propagation during user creation." into nyc-dev 2016-05-26 03:51:39 +00:00
Dirk Dougherty
3930b5091e Remove spurious url reference.
Change-Id: I35e5869ed71677b11af8c451a16661faa896ca1f
2016-05-25 20:29:59 -07:00
Trevor Johns
5513b6776e docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e
am: 46c1d5a5d2

* commit '46c1d5a5d2b4c1d6a680f7af5c3973486c1fef2c':
  docs: Fix broken link in Volley training

Change-Id: Ib5ae3925cca39db0145bb4c6e6eeb53488bfc316
2016-05-26 02:19:23 +00:00
Trevor Johns
46c1d5a5d2 docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346
am: c8c2abed0e

* commit 'c8c2abed0e7418d7e0fb0ef73a0c363cec011b95':
  docs: Fix broken link in Volley training

Change-Id: I916717fca33fc1466cd1c022c6a4f5f931d00ebe
2016-05-26 01:59:17 +00:00
Jonathan Basseri
8a6561d177 Change how TelephonyManager handles subscriptions.
Addressing API council feedback, remove* all subscription ID arguments
from API calls, and provide a factory method to create a new
TelephonyManager which uses a given subId.

* The subId methods will be @hidden instead of deleted.

Bug: 28845064
Change-Id: I2de8ae9e45bc14962c7c20d7d076ec83bce92cd3
2016-05-25 18:49:11 -07:00
Joe Fernandez
e8a0b488dc docs: Remove Advertising ID page and redirect to GMS reference docs
b/28965089

Change-Id: I16141cf5711358c1b38f7e28a8150e2281990eb6
2016-05-25 18:36:12 -07:00
Trevor Johns
c8c2abed0e docs: Fix broken link in Volley training am: 05dd9d2c29
am: 346114e346

* commit '346114e3467cc06b2a90467a00288f6944dd969b':
  docs: Fix broken link in Volley training

Change-Id: Ifb20e8fd2a2c4d87786e61e6490e52dd06742810
2016-05-26 01:32:43 +00:00
Trevor Johns
346114e346 docs: Fix broken link in Volley training
am: 05dd9d2c29

* commit '05dd9d2c291c3b5becdf27b78cc0685be3bb5389':
  docs: Fix broken link in Volley training

Change-Id: Ia20dd9788d855129033c82e2161e01dc382d85b7
2016-05-26 01:18:44 +00:00
TreeHugger Robot
fbf3a0964a Merge "Use app's best locale if they override LocaleList" into nyc-dev 2016-05-26 01:11:03 +00:00
TreeHugger Robot
bc983c4431 Merge "N is API 24" into nyc-dev 2016-05-26 01:03:08 +00:00
Sid Soundararajan
7cb7a0aa60 Merge "Make content descriptions of task cards, the title description" into nyc-dev 2016-05-26 00:45:28 +00:00
Dianne Hackborn
dbcca24f8e Merge "Fix issue #28964589: Binding dies when (unrelated) component is disabled in package" into nyc-dev 2016-05-26 00:43:33 +00:00
Alan Viverette
8f0ab27570 Merge "Fix borderless colored button text color" into nyc-dev 2016-05-26 00:40:19 +00:00
Andrii Kulian
a1984286d3 Merge "Fix exception when trying to update config of detached stack" into nyc-dev 2016-05-26 00:24:10 +00:00
Android Build Merger (Role)
36a1b38e89 Merge "Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8 am: 38a37f336f -s ours" into nyc-dev 2016-05-26 00:24:01 +00:00
Chris Tate
dbda4c2f9a Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8
am: 38a37f336f  -s ours

* commit '38a37f336f96896146efc1a85310504bf4f77116':
  Backport of backup transport whitelist

Change-Id: I63c06c0bdfc8a8a254bdf81fce5a76b46c59bfd8
2016-05-26 00:22:47 +00:00