OSDN Git Service

android-x86/frameworks-base.git
8 years agoDefer calling the stack task removed callbacks.
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

8 years agoMerge "Suppress unlock notifications on non-FBE devices." into nyc-dev
Jeff Sharkey [Thu, 26 May 2016 19:53:16 +0000 (19:53 +0000)]
Merge "Suppress unlock notifications on non-FBE devices." into nyc-dev

8 years agoMerge "Replace caribou wallpaper without the stars b/28339724" 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

8 years agoMerge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am: 8e08dbe8f8
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

8 years agoMerge "docs: Removing CLI steps in getting started docs" into mnc-io-docs
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

8 years agoMerge "docs: Removing CLI steps in getting started docs" into mnc-io-docs
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

8 years agodocs: Removing CLI steps in getting started 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

8 years agoMerge "Unlocked access of mServices is bad." into nyc-dev
Julia Reynolds [Thu, 26 May 2016 18:46:38 +0000 (18:46 +0000)]
Merge "Unlocked access of mServices is bad." into nyc-dev

8 years agoMerge "Reset slider animator on density change" 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

8 years agoMerge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev
Fyodor Kupolov [Thu, 26 May 2016 18:20:35 +0000 (18:20 +0000)]
Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev

8 years agoadd redirect for Espresso Test Recorder doc that will soon be on TAC site. am: 8f60544180
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

8 years agoMerge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am...
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

8 years agoadd redirect for Espresso Test Recorder doc that will soon be on TAC site.
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

8 years agoDO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am...
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

8 years agoUnlocked access of mServices is bad.
Julia Reynolds [Thu, 26 May 2016 17:49:17 +0000 (13:49 -0400)]
Unlocked access of mServices is bad.

Change-Id: I626d2daffb3669c7bea4856f8ee66dbd13951163
Fixes: 28979051

8 years agoMerge "Update the light center when the root view's layout changed" into nyc-dev
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

8 years agoMerge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY"...
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

8 years agoReset slider animator on density change
Julia Reynolds [Thu, 26 May 2016 17:43:38 +0000 (13:43 -0400)]
Reset slider animator on density change

Change-Id: Iae7d32746c6ea2cabe7d0d58ff11a05d1722fce4
Fixes: 28626591

8 years agoAudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY
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>
8 years agoadd redirect for Espresso Test Recorder doc that will soon be on TAC site.
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

8 years agoMerge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev
Manoja Wijewardene [Thu, 26 May 2016 17:20:48 +0000 (17:20 +0000)]
Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" 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

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 16:56:12 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Importance slider updates." into nyc-dev
Julia Reynolds [Thu, 26 May 2016 16:50:56 +0000 (16:50 +0000)]
Merge "Importance slider updates." into nyc-dev

8 years agoMerge "Cache IMountService for isUserKeyUnlocked() calls." 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

8 years agoMerge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev
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

8 years agoMerge "Check if we're connected before marking a UID blocked" 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

8 years agoMerge "add metrics for notification and group expansion" 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

8 years agoMerge "boost starred people to at least high importance" 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

8 years agoMerge "Change how TelephonyManager handles subscriptions." into nyc-dev
Jonathan Basseri [Thu, 26 May 2016 15:50:03 +0000 (15:50 +0000)]
Merge "Change how TelephonyManager handles subscriptions." into nyc-dev

8 years agoSuppress unlock notifications on non-FBE devices.
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

8 years agoMerge "Rename carrier messaging API constant." into nyc-dev
Ji Yang [Thu, 26 May 2016 15:40:11 +0000 (15:40 +0000)]
Merge "Rename carrier messaging API constant." into nyc-dev

8 years agoCache IMountService for isUserKeyUnlocked() calls.
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

8 years agoCheck if we're connected before marking a UID blocked
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

8 years agoMerge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am...
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

8 years agoMerge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am...
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

8 years agoImportance slider updates.
Julia Reynolds [Thu, 26 May 2016 15:07:49 +0000 (11:07 -0400)]
Importance slider updates.

Icon & tint.

Bug: 28911161
Change-Id: Id8c3a4b79326eb5073a600de49ac14ae7223b398

8 years agoMerge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am...
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

8 years agoQS: Make hotspot go unavailable in airplane mode
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

8 years agoMerge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am...
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

8 years agoMerge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am...
Paul Jensen [Thu, 26 May 2016 14:35:08 +0000 (14:35 +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

* commit '75095e6f02b13d070bb74b019ab6392f0f7b1105':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I0da4c878a1bd78837abc40a3ab332c6a1e781d3e

8 years agoMerge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am...
Paul Jensen [Thu, 26 May 2016 14:13:16 +0000 (14: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

* commit '42a59833648243a8ac3aec7adf7f4ca0d3babdd1':
  Don't pass URL path and username/password to PAC scripts

Change-Id: Id92ff5deed707c029fc6d5806aff2a324961c2ec

8 years agoMerge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev
Michael Wright [Thu, 26 May 2016 14:03:46 +0000 (14:03 +0000)]
Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev

8 years agoMerge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am...
Paul Jensen [Thu, 26 May 2016 14:01:19 +0000 (14:01 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141
am: 6c35cf2434

* commit '6c35cf2434ca373196b16620455f8f234b63d594':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I9bbca312129011822fc5ea95682bac5ca4258ced

8 years agoMerge "Add resetKeyStore() in LockSettingsService" into nyc-dev
Ricky Wai [Thu, 26 May 2016 13:46:25 +0000 (13:46 +0000)]
Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev

8 years agoMerge "Store work lock type even it uses unified lock" into nyc-dev
Ricky Wai [Thu, 26 May 2016 13:46:11 +0000 (13:46 +0000)]
Merge "Store work lock type even it uses unified lock" into nyc-dev

8 years agoMerge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am...
Paul Jensen [Thu, 26 May 2016 13:44:37 +0000 (13:44 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff
am: bb27626141

* commit 'bb2762614181a0ee03554a96c070ea1006d7263c':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I9e4d3282765dec1554955b9f72484e9d7e2d6594

8 years agoMerge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am...
Paul Jensen [Thu, 26 May 2016 13:37:24 +0000 (13:37 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff
am: 8940d2b0ff

* commit '8940d2b0ff2fb5a9cc9e12be8a7959670e4390ac':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I03d6273d7ddaecac071ab3d1207d3d684e80159e

8 years agoMerge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev
Paul Jensen [Thu, 26 May 2016 13:30:59 +0000 (13:30 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev
am: af0b4466ff

* commit 'af0b4466ffe2ed09b288014d1d3a9ed308fe3c76':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I8a49a29ed1999ab811d3306dc46769d83c05244e

8 years agoMerge "Don't pass URL path and username/password to PAC scripts" into klp-dev
Paul Jensen [Thu, 26 May 2016 13:18:04 +0000 (13:18 +0000)]
Merge "Don't pass URL path and username/password to PAC scripts" into klp-dev

8 years agoDO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am...
Christopher Tate [Thu, 26 May 2016 12:52:19 +0000 (12:52 +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

* commit '040cf14047fb025f603c73e56a9bfd06c84a2483':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I3f6a42a6a1c3492439a8a7a93537de52a6f1cf1f

8 years agoDO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am...
Christopher Tate [Thu, 26 May 2016 12:31:55 +0000 (12:31 +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

* commit '1fa817c057c909d1ba4f5a356f6eb4b52a3bc628':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: Ia409bff3b5db1ba686d884f81e45b242ec1ae38f

8 years agoMerge "Use correct user id when checking uri grants for notification." into nyc-dev
Nicolas Prévot [Thu, 26 May 2016 10:37:31 +0000 (10:37 +0000)]
Merge "Use correct user id when checking uri grants for notification." into nyc-dev

8 years agoMerge "Docs: Update content license page to include Javadocs licenses" into nyc-dev
Yi Kong [Thu, 26 May 2016 08:54:56 +0000 (08:54 +0000)]
Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 26 May 2016 07:41:49 +0000 (00:41 -0700)]
Import translations. DO NOT MERGE

Change-Id: I20074824d92bd827a9f12d13f659d52286be1007
Auto-generated-cl: translation import

8 years agoMerge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev
Lajos Molnar [Thu, 26 May 2016 06:14:03 +0000 (06:14 +0000)]
Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev

8 years agoMerge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a am: a7c0788467
Dirk Dougherty [Thu, 26 May 2016 05:44:29 +0000 (05:44 +0000)]
Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a am: a7c0788467
am: 1cf99365cb

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

Change-Id: I744e556ebdb729314542dd9115346d42daf63e09

8 years agoMerge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a
Dirk Dougherty [Thu, 26 May 2016 05:35:46 +0000 (05:35 +0000)]
Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a
am: a7c0788467

* commit 'a7c0788467d865e72ddbaa5862382d8ecc164039':
  Remove spurious url reference.

Change-Id: Ifb9a772d89c60124334b3a78a2f5864f879d104f

8 years agoMerge "Remove spurious url reference." into mnc-mr-docs
Dirk Dougherty [Thu, 26 May 2016 05:17:01 +0000 (05:17 +0000)]
Merge "Remove spurious url reference." into mnc-mr-docs
am: 1ed701493a

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

Change-Id: I6b304fe5f87804f9c0d4de9bfef92437810ac9ea

8 years agoReplace caribou wallpaper without the stars
Hyunyoung Song [Thu, 26 May 2016 05:10:55 +0000 (22:10 -0700)]
Replace caribou wallpaper without the stars
b/28339724

Change-Id: I1c7f9024ffbdd51f675996ef156bc4882588da30

8 years agoMerge "Remove spurious url reference." into mnc-mr-docs
Dirk Dougherty [Thu, 26 May 2016 05:03:24 +0000 (05:03 +0000)]
Merge "Remove spurious url reference." into mnc-mr-docs

8 years agoMerge "Merge "Track changes to network security config manifest configuration" into...
Chad Brubaker [Thu, 26 May 2016 04:47:44 +0000 (04:47 +0000)]
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

8 years agoMerge "docs: Remove Advertising ID page and redirect to GMS reference docs" into...
Joe Fernandez [Thu, 26 May 2016 04:47:34 +0000 (04:47 +0000)]
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

8 years agoMerge "Merge "Track changes to network security config manifest configuration" into...
Chad Brubaker [Thu, 26 May 2016 04:37:17 +0000 (04:37 +0000)]
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

8 years agoMerge "docs: Remove Advertising ID page and redirect to GMS reference docs" into...
Joe Fernandez [Thu, 26 May 2016 04:37:09 +0000 (04:37 +0000)]
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

8 years agoMerge "Merge "Track changes to network security config manifest configuration" into...
Android Build Merger (Role) [Thu, 26 May 2016 04:26:32 +0000 (04:26 +0000)]
Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs

8 years agoMerge "docs: Remove Advertising ID page and redirect to GMS reference docs" into...
Joe Fernandez [Thu, 26 May 2016 04:26:24 +0000 (04:26 +0000)]
Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs

8 years agoMerge "Track changes to network security config manifest configuration" into mnc...
Chad Brubaker [Thu, 26 May 2016 04:26:11 +0000 (04:26 +0000)]
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

8 years agoMerge "Track changes to network security config manifest configuration" into mnc...
Chad Brubaker [Thu, 26 May 2016 04:09:39 +0000 (04:09 +0000)]
Merge "Track changes to network security config manifest configuration" into mnc-mr-docs

8 years agoMerge "Fix system locale propagation during user creation." into nyc-dev
Seigo Nonaka [Thu, 26 May 2016 03:51:38 +0000 (03:51 +0000)]
Merge "Fix system locale propagation during user creation." into nyc-dev

8 years agoRemove spurious url reference.
Dirk Dougherty [Thu, 26 May 2016 03:29:59 +0000 (20:29 -0700)]
Remove spurious url reference.

Change-Id: I35e5869ed71677b11af8c451a16661faa896ca1f

8 years agodocs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e
Trevor Johns [Thu, 26 May 2016 02:19:23 +0000 (02:19 +0000)]
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

8 years agodocs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346
Trevor Johns [Thu, 26 May 2016 01:59:17 +0000 (01:59 +0000)]
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

8 years agoChange how TelephonyManager handles subscriptions.
Jonathan Basseri [Wed, 25 May 2016 20:33:05 +0000 (13:33 -0700)]
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

8 years agodocs: Remove Advertising ID page and redirect to GMS reference docs
Joe Fernandez [Thu, 26 May 2016 01:36:12 +0000 (18:36 -0700)]
docs: Remove Advertising ID page and redirect to GMS reference docs

b/28965089

Change-Id: I16141cf5711358c1b38f7e28a8150e2281990eb6

8 years agodocs: Fix broken link in Volley training am: 05dd9d2c29
Trevor Johns [Thu, 26 May 2016 01:32:43 +0000 (01:32 +0000)]
docs: Fix broken link in Volley training am: 05dd9d2c29
am: 346114e346

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

Change-Id: Ifb20e8fd2a2c4d87786e61e6490e52dd06742810

8 years agodocs: Fix broken link in Volley training
Trevor Johns [Thu, 26 May 2016 01:18:44 +0000 (01:18 +0000)]
docs: Fix broken link in Volley training
am: 05dd9d2c29

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

Change-Id: Ia20dd9788d855129033c82e2161e01dc382d85b7

8 years agoMerge "Use app's best locale if they override LocaleList" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 01:11:02 +0000 (01:11 +0000)]
Merge "Use app's best locale if they override LocaleList" into nyc-dev

8 years agoMerge "N is API 24" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 01:03:06 +0000 (01:03 +0000)]
Merge "N is API 24" into nyc-dev

8 years agoDO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am...
Christopher Tate [Thu, 26 May 2016 00:53:35 +0000 (00:53 +0000)]
DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8  -s ours am: 077534b101 am: 4c559cdade am: 24ceca96af  -s ours
am: 88c9eae886

* commit '88c9eae886ff99d37da0f13af4b2e045e9332289':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I3e37d8e8e6064dc0f5640c38b9cc4a72bd028c19

8 years agoMerge "Make content descriptions of task cards, the title description" into nyc-dev
Sid Soundararajan [Thu, 26 May 2016 00:45:27 +0000 (00:45 +0000)]
Merge "Make content descriptions of task cards, the title description" into nyc-dev

8 years agoMerge "Fix issue #28964589: Binding dies when (unrelated) component is disabled in...
Dianne Hackborn [Thu, 26 May 2016 00:43:32 +0000 (00:43 +0000)]
Merge "Fix issue #28964589: Binding dies when (unrelated) component is disabled in package" into nyc-dev

8 years agoMerge "Fix borderless colored button text color" into nyc-dev
Alan Viverette [Thu, 26 May 2016 00:40:17 +0000 (00:40 +0000)]
Merge "Fix borderless colored button text color" into nyc-dev

8 years agoMerge "Fix exception when trying to update config of detached stack" into nyc-dev
Andrii Kulian [Thu, 26 May 2016 00:24:07 +0000 (00:24 +0000)]
Merge "Fix exception when trying to update config of detached stack" into nyc-dev

8 years agoMerge "Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22...
Android Build Merger (Role) [Thu, 26 May 2016 00:23:59 +0000 (00:23 +0000)]
Merge "Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8 am: 38a37f336f  -s ours" into nyc-dev

8 years agoMerge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f...
Chris Tate [Thu, 26 May 2016 00:22:47 +0000 (00:22 +0000)]
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

8 years agoMerge "Un-deprecated Android mock testing APIs" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 00:22:28 +0000 (00:22 +0000)]
Merge "Un-deprecated Android mock testing APIs" into nyc-dev

8 years agoDO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am...
Christopher Tate [Thu, 26 May 2016 00:12:37 +0000 (00:12 +0000)]
DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8  -s ours am: 077534b101 am: 4c559cdade
am: 24ceca96af  -s ours

* commit '24ceca96af925ac19a1fa337afc0e739d9cb11ad':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I1c79f9a012981dc2be9c8342674780c85bbf6663

8 years agoMerge "Improve accessibility window title behavior" into nyc-dev
Phil Weaver [Thu, 26 May 2016 00:11:23 +0000 (00:11 +0000)]
Merge "Improve accessibility window title behavior" into nyc-dev

8 years agoMake content descriptions of task cards, the title description
Sid Soundararajan [Thu, 26 May 2016 00:08:12 +0000 (17:08 -0700)]
Make content descriptions of task cards, the title description

Use the title description as content description for the task
card, this should be better for talkback.

BUG: 28594452
Change-Id: Idc97004f1370a35ea5328c4e9e46a72a9349c8f4

8 years agoMerge "BatteryStats: Allow for sample errors in wlan stats" into nyc-dev
TreeHugger Robot [Wed, 25 May 2016 23:51:00 +0000 (23:51 +0000)]
Merge "BatteryStats: Allow for sample errors in wlan stats" into nyc-dev

8 years agoUse app's best locale if they override LocaleList
Adam Lesinski [Wed, 25 May 2016 23:45:14 +0000 (16:45 -0700)]
Use app's best locale if they override LocaleList

App's can technically override their configuration's Locale,
which means we must choose the overriden locale as the best,
and therefore set the LocaleList.setDefault() with that locale.

Bug:28953437
Change-Id: I4b301fcd6bc426e37bb389d3a6f2b4a3c69ac33a

8 years agoN is API 24
Adam Powell [Wed, 25 May 2016 23:36:41 +0000 (16:36 -0700)]
N is API 24

Change-Id: Ifea71ccff96c3c70f9f3e60ecdcb2b56af82bb08

8 years agoMerge "Per API review, revert the API renaming CL." into nyc-dev
Derek Tan [Wed, 25 May 2016 23:41:19 +0000 (23:41 +0000)]
Merge "Per API review, revert the API renaming CL." into nyc-dev

8 years agoDO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am...
Christopher Tate [Wed, 25 May 2016 23:16:15 +0000 (23:16 +0000)]
DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8  -s ours am: 077534b101
am: 4c559cdade

* commit '4c559cdadea4b74262b40cbefe4a76a0e22ccc68':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: Iff8942e506b14cb2d0e64623daea3bdc3cee2142

8 years agoMerge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca
Christopher Tate [Wed, 25 May 2016 23:16:02 +0000 (23:16 +0000)]
Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca
am: c69aa838a8

* commit 'c69aa838a8f89ba7476ce554ecf5a19a6de78b28':
  Backport of backup transport whitelist

Change-Id: I0151279dfa467d6f456c2cfb4066cbc2ff4f7365

8 years agodocs: Fix broken link in Volley training
Trevor Johns [Wed, 25 May 2016 23:10:56 +0000 (16:10 -0700)]
docs: Fix broken link in Volley training

Inline link from from "Making a Standard Request" to "Implementing a
Custom Request" had a typo in the URL string.

Change-Id: I8f7d79e47ea82f423b9e56ef6d908938564a3fe9

8 years agoFix issue #28964589: Binding dies when (unrelated) component is disabled in package
Dianne Hackborn [Wed, 25 May 2016 23:12:02 +0000 (16:12 -0700)]
Fix issue #28964589: Binding dies when (unrelated) component is disabled in package

We go through the same path for uninstalling and changing an app...
both of which would do a full force stop.  That is only appropriate
for uninstalling; for changing, we should just be killing its processes.

Change-Id: Ia87750d96d3e3eb7ee30841429eb926c20c5ad78

8 years agoMerge "Move add-printer list headers to the right positions." into nyc-dev
Philip P. Moltmann [Wed, 25 May 2016 23:10:25 +0000 (23:10 +0000)]
Merge "Move add-printer list headers to the right positions." into nyc-dev

8 years agoMerge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22
Chris Tate [Wed, 25 May 2016 23:06:54 +0000 (23:06 +0000)]
Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22
am: 600d4f61ca

* commit '600d4f61ca15b375c9acef64d52913f0ab823deb':
  Backport of backup transport whitelist

Change-Id: I308a0f0284990dc8e327c581cac49db899ad6cfa