OSDN Git Service

android-x86/frameworks-base.git
8 years agoadd redirect for Espresso Test Recorder doc that will soon be on TAC site. am: 8f6054...
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

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

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

Change-Id: I75e1b139492cac12bf73fa68894f2e7ae7deb701

8 years agoDO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am...
Christopher Tate [Fri, 27 May 2016 03:14:07 +0000 (03:14 +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

* commit '50aa0324c9f425b83b4ca241fb8727033f026532':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I380d5828e9b8b8860d59d2ea9077b368f1c82d55

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

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

8 years agoMerge "Merge "Importance slider updates." into nyc-dev am: 2bf73e94c3 am: 901bdeadef...
Android Build Merger (Role) [Fri, 27 May 2016 03:03:46 +0000 (03:03 +0000)]
Merge "Merge "Importance slider updates." into nyc-dev am: 2bf73e94c3 am: 901bdeadef" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Update the light center when the root view\'s layout changed" into...
Android Build Merger (Role) [Fri, 27 May 2016 03:03:41 +0000 (03:03 +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

8 years agoMerge "Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev am...
Android Build Merger (Role) [Fri, 27 May 2016 03:03:36 +0000 (03:03 +0000)]
Merge "Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev am: 36cbf5ca37 am: 6843da1aa8" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENC...
Android Build Merger (Role) [Fri, 27 May 2016 03:03:30 +0000 (03:03 +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

8 years agoMerge "Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev am:...
Android Build Merger (Role) [Fri, 27 May 2016 03:03:22 +0000 (03:03 +0000)]
Merge "Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev am: 72f19ff6f0 am: b59383a375" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc...
Android Build Merger (Role) [Fri, 27 May 2016 03:03:14 +0000 (03:03 +0000)]
Merge "Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev am: 1ad12e0678 am: d667ff5930" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev...
Android Build Merger (Role) [Fri, 27 May 2016 03:03:09 +0000 (03:03 +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

8 years agoMerge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9aed8c2fa0 -s...
Android Build Merger (Role) [Fri, 27 May 2016 03:03:01 +0000 (03:03 +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

8 years agoMerge "Merge "add metrics for notification and group expansion" into nyc-dev am:...
Android Build Merger (Role) [Fri, 27 May 2016 03:02:59 +0000 (03:02 +0000)]
Merge "Merge "add metrics for notification and group expansion" into nyc-dev am: 0f97b8fcbd am: 32b50d9c39" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Update the light center when the root view\'s layout changed" into nyc-dev...
Tenghui Zhu [Fri, 27 May 2016 03:02:14 +0000 (03:02 +0000)]
Merge "Update the light center when the root view\'s layout changed" into nyc-dev am: e78ba24c17
am: 56d4dae9ec

* commit '56d4dae9ec7503660bdd762e2e04f267d7f2704c':
  Update the light center when the root view's layout changed

Change-Id: Ifedcb88adb38eb23ad82b7836c5de5f738c80c10

8 years agoMerge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY"...
Phil Burk [Fri, 27 May 2016 03:02:09 +0000 (03:02 +0000)]
Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev am: d34d06606d
am: 29e8879307

* commit '29e8879307bc0a73f34b12074944c788821a4373':
  AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY

Change-Id: Id74f4c4831fd070cfdfb1228c9813635bd18ccbc

8 years agoMerge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev am...
Manoja Wijewardene [Fri, 27 May 2016 03:02:03 +0000 (03:02 +0000)]
Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev am: 1ad12e0678
am: d667ff5930

* commit 'd667ff5930240fbb3aab057a9da2a9d173f6b94c':
  Elaborate on requirement to support PreRebootSecurityLogs

Change-Id: Ib6ca093eb4041ff298a31eea5da5bebac6db491c

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev am: 9aed8c2fa0 -s ours
Bill Yi [Fri, 27 May 2016 03:01:58 +0000 (03:01 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9aed8c2fa0  -s ours
am: 02befc3229  -s ours

* commit '02befc32293351a93a1ba073ff884e6135c0c121':
  Import translations. DO NOT MERGE

Change-Id: If60580203a307385c138d41f41790e8ca3852120

8 years agoMerge "Importance slider updates." into nyc-dev am: 2bf73e94c3
Julia Reynolds [Fri, 27 May 2016 03:01:53 +0000 (03:01 +0000)]
Merge "Importance slider updates." into nyc-dev am: 2bf73e94c3
am: 901bdeadef

* commit '901bdeadef9c293c093e7902b414734b9c63ac2c':
  Importance slider updates.

Change-Id: I2a33854c4fc17435684e159033f3860d3f46a70f

8 years agoMerge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev am: 36cbf5ca37
Jeff Sharkey [Fri, 27 May 2016 03:00:53 +0000 (03:00 +0000)]
Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev am: 36cbf5ca37
am: 6843da1aa8

* commit '6843da1aa8da6374dde23ef20bad2abfed6aaba2':
  Cache IMountService for isUserKeyUnlocked() calls.

Change-Id: Ie9aff29f7488bd78d13c6915874a3d1ef53e6715

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev am: cb8c569414 -s ours
Bill Yi [Fri, 27 May 2016 03:00:13 +0000 (03:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am: cb8c569414  -s ours
am: 977d5bbfd2  -s ours

* commit '977d5bbfd2f67d18978ab55fbf26cbcfc282283e':
  Import translations. DO NOT MERGE

Change-Id: I85443596959d0cfd85225f2aa3c336eab2c042e4

8 years agoMerge "Importance slider updates." into nyc-dev am: 2bf73e94c3
Julia Reynolds [Fri, 27 May 2016 02:59:17 +0000 (02:59 +0000)]
Merge "Importance slider updates." into nyc-dev am: 2bf73e94c3
am: 19a8d034fb

* commit '19a8d034fbdfb1a6d0ec4b9b808d82f30cbb834f':
  Importance slider updates.

Change-Id: I257ec5f912b9036ec5f18ba249951dd80ad6bc4b

8 years agoMerge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev am: 36cbf5ca37
Jeff Sharkey [Fri, 27 May 2016 02:58:50 +0000 (02:58 +0000)]
Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev am: 36cbf5ca37
am: bda14dd987

* commit 'bda14dd987498d4c75dcbbe7b4bba73db165c1c8':
  Cache IMountService for isUserKeyUnlocked() calls.

Change-Id: Ic5577c55324a52e761919febc0cab9af0e18e919

8 years agoMerge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev am: 72f19ff6f0
Jason Monk [Fri, 27 May 2016 02:58:33 +0000 (02:58 +0000)]
Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev am: 72f19ff6f0
am: b59383a375

* commit 'b59383a375c41936ac5e2865383ef49b267e7b10':
  QS: Make hotspot go unavailable in airplane mode

Change-Id: I5d250ddd412327f9065111b3becb4f2e77a55a73

8 years agoMerge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev am: 72f19ff6f0
Jason Monk [Fri, 27 May 2016 02:58:33 +0000 (02:58 +0000)]
Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev am: 72f19ff6f0
am: 628c714f3e

* commit '628c714f3e3414155f4e477bfa8d76b520ced01b':
  QS: Make hotspot go unavailable in airplane mode

Change-Id: I1db7a4e27b0e518509ac0e51e44c2f3fd781b38b

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

8 years agoMerge "Check if we\'re connected before marking a UID blocked" into nyc-dev am: 33154...
Robin Lee [Fri, 27 May 2016 02:58:19 +0000 (02:58 +0000)]
Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev am: 33154deb70
am: 6c3cb2c392

* commit '6c3cb2c3926182245a0e80a7e3c95ff04d032b06':
  Check if we're connected before marking a UID blocked

Change-Id: Ib2b6ddd0d5a6e7a4b825a3113d275d753c5c08b0

8 years agoMerge "Check if we\'re connected before marking a UID blocked" into nyc-dev am: 33154...
Robin Lee [Fri, 27 May 2016 02:57:33 +0000 (02:57 +0000)]
Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev am: 33154deb70
am: 174385a208

* commit '174385a2084439678bea758733edd893b255d22a':
  Check if we're connected before marking a UID blocked

Change-Id: I31b69b3e7bb307c80c472941f57e480888918a34

8 years agoMerge "add metrics for notification and group expansion" into nyc-dev am: 0f97b8fcbd
Chris Wren [Fri, 27 May 2016 02:56:24 +0000 (02:56 +0000)]
Merge "add metrics for notification and group expansion" into nyc-dev am: 0f97b8fcbd
am: 32b50d9c39

* commit '32b50d9c39f8ffd740d8e95549004559bed2f954':

Change-Id: I545c3ce7b10858d88866b17c800f7e6d82d7fae1

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

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

8 years agoMerge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev
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

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

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

8 years agoMerge "Importance slider updates." into nyc-dev
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

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

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

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

8 years agoresolve merge conflicts of 0f97b8f to nyc-mr1-dev
Chris Wren [Fri, 27 May 2016 02:39:20 +0000 (02:39 +0000)]
resolve merge conflicts of 0f97b8f to nyc-mr1-dev
am: 5b3b72e7b7

* commit '5b3b72e7b7a926ac954db23c2ceaf10aa9b32539':
  add metrics for notification and group expansion

Change-Id: I2df2f6e2ba27e4368162ce0642c77ec0a559620e

8 years agoresolve merge conflicts of 0f97b8f to nyc-mr1-dev
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

8 years agoMerge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev
Fyodor Kupolov [Fri, 27 May 2016 00:54:20 +0000 (00:54 +0000)]
Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev
am: 2c5cbd4012

* commit '2c5cbd4012aef736c94a7afc84a778623c639d10':
  Clean up demo dir when leaving demo mode

Change-Id: Ia7891f8e5106130d669a1daa7fcc691db1f5e4c7

8 years agoMerge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev
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

8 years agoMerge "Merge "boost starred people to at least high importance" into nyc-dev am:...
Android Build Merger (Role) [Thu, 26 May 2016 23:27:31 +0000 (23:27 +0000)]
Merge "Merge "boost starred people to at least high importance" into nyc-dev am: 8e5d7413b8 am: 9f7067bb80" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Change how TelephonyManager handles subscriptions." into nyc-dev am...
Android Build Merger (Role) [Thu, 26 May 2016 23:27:20 +0000 (23:27 +0000)]
Merge "Merge "Change how TelephonyManager handles subscriptions." into nyc-dev am: 4c04097fdb am: 531cd8724c" into nyc-mr1-dev-plus-aosp

8 years agoMerge "boost starred people to at least high importance" into nyc-dev am: 8e5d7413b8
Chris Wren [Thu, 26 May 2016 23:25:35 +0000 (23:25 +0000)]
Merge "boost starred people to at least high importance" into nyc-dev am: 8e5d7413b8
am: 9f7067bb80

* commit '9f7067bb80b79396992b719ac46e8ab47e00ff10':
  boost starred people to at least high importance

Change-Id: Ie452e76ad683e916699d9bfa4ee6d687b6d5d961

8 years agoMerge "Change how TelephonyManager handles subscriptions." into nyc-dev am: 4c04097fdb
Jonathan Basseri [Thu, 26 May 2016 23:24:45 +0000 (23:24 +0000)]
Merge "Change how TelephonyManager handles subscriptions." into nyc-dev am: 4c04097fdb
am: 531cd8724c

* commit '531cd8724cad56e2a141dbe5acbe283372c21de4':

Change-Id: I60f30d1169e65fde080d398a06d2b543a0278238

8 years agoMerge "boost starred people to at least high importance" into nyc-dev am: 8e5d7413b8
Chris Wren [Thu, 26 May 2016 23:24:29 +0000 (23:24 +0000)]
Merge "boost starred people to at least high importance" into nyc-dev am: 8e5d7413b8
am: 6c751b2e60

* commit '6c751b2e60868513f69f49a9b6662b9737979c94':
  boost starred people to at least high importance

Change-Id: Ie853218f61b2e089937482d0545e9acef1fe36fd

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

8 years agoresolve merge conflicts of 4c04097 to nyc-mr1-dev
Jonathan Basseri [Thu, 26 May 2016 23:13:17 +0000 (23:13 +0000)]
resolve merge conflicts of 4c04097 to nyc-mr1-dev
am: 04c35e78db

* commit '04c35e78dbd5bc6670b5bf4e72686f696745af13':
  Change how TelephonyManager handles subscriptions.

Change-Id: Ie26627bb443603f1e5f017a8df243922d2955f3d

8 years agoresolve merge conflicts of 4c04097 to nyc-mr1-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

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 agoMerge "Added new action for gesture settings." into nyc-mr1-dev
Doris Ling [Thu, 26 May 2016 17:51:23 +0000 (17:51 +0000)]
Merge "Added new action for gesture settings." into nyc-mr1-dev
am: ce8e88aaab

* commit 'ce8e88aaabdca9572a17e59e4d54db055a11e10a':
  Added new action for gesture settings.

Change-Id: I0756549196b98e1abeece0af3ab4956204c05e9d

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 26 May 2016 17:51:19 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 62d1f54d04  -s ours

* commit '62d1f54d0473261909dc515878fe23b64d279d1b':
  Import translations. DO NOT MERGE

Change-Id: Ic7bb1288dc08b4646a643f62f1aebf7f5314baed

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 agoMerge "Importance slider updates." into nyc-dev
Julia Reynolds [Thu, 26 May 2016 17:36:52 +0000 (17:36 +0000)]
Merge "Importance slider updates." into nyc-dev
am: 2bf73e94c3

* commit '2bf73e94c389bf9457df132d6eaf294f9d35587f':
  Importance slider updates.

Change-Id: I26df0b8c0aa02cba63b485b85845cfc631416cd8

8 years agoMerge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev
Jeff Sharkey [Thu, 26 May 2016 17:35:16 +0000 (17:35 +0000)]
Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev
am: 36cbf5ca37

* commit '36cbf5ca378523bfa4f5394e39f5fcff2b2461de':
  Cache IMountService for isUserKeyUnlocked() calls.

Change-Id: I0e4ae30da7c40cf4712147c65bfb0fbec5f84b95

8 years agoMerge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev
Jason Monk [Thu, 26 May 2016 17:34:53 +0000 (17:34 +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: I3dfc510ddcad9e446806a235fa96bbf975ede4b8

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 agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 26 May 2016 17:33:40 +0000 (17:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 06b1de25af  -s ours

* commit '06b1de25afb1a2bfce1cfc38a88584efc7d73c2f':
  Import translations. DO NOT MERGE

Change-Id: Ic2199da26da3980ac74c09b92b6b39a83ec9e133

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 "Added new action for gesture settings." into nyc-mr1-dev
Doris Ling [Thu, 26 May 2016 17:20:53 +0000 (17:20 +0000)]
Merge "Added new action for gesture settings." into nyc-mr1-dev

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-mr1-dev
TreeHugger Robot [Thu, 26 May 2016 17:07:23 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-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 "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 26 May 2016 16:55:57 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Check if we\'re connected before marking a UID blocked" into nyc-dev
Robin Lee [Thu, 26 May 2016 16:54:34 +0000 (16:54 +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: I59468eda566dca96faafe328f19bd94d67b16d9d

8 years agoMerge "add metrics for notification and group expansion" into nyc-dev
Chris Wren [Thu, 26 May 2016 16:54:27 +0000 (16:54 +0000)]
Merge "add metrics for notification and group expansion" into nyc-dev
am: 0f97b8fcbd

* commit '0f97b8fcbddbbd40f5cf45ba57a5d9db48a611a0':
  add metrics for notification and group expansion

Change-Id: I32d730fcc03da49217d9c4ba2a27f41e15eca73f

8 years agoMerge "boost starred people to at least high importance" into nyc-dev
Chris Wren [Thu, 26 May 2016 16:54:20 +0000 (16:54 +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: I2cf177c7be3693d05132c8fdd75d5387854a8b88

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 "Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff...
Android Build Merger (Role) [Thu, 26 May 2016 16:15:27 +0000 (16:15 +0000)]
Merge "Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff am: f8969b233c" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff
Ji Yang [Thu, 26 May 2016 16:12:57 +0000 (16:12 +0000)]
Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff
am: f8969b233c

* commit 'f8969b233c1637d4945e4fe2c3c9a35fef5019ed':
  Rename carrier messaging API constant.

Change-Id: I770c85c4036de650f78bb0bdb57ea610049e9511

8 years agoMerge "Change how TelephonyManager handles subscriptions." into nyc-dev
Jonathan Basseri [Thu, 26 May 2016 16:12:55 +0000 (16:12 +0000)]
Merge "Change how TelephonyManager handles subscriptions." into nyc-dev
am: 4c04097fdb

* commit '4c04097fdbe0fe414a6fcb2d6174e295986a3f66':
  Change how TelephonyManager handles subscriptions.

Change-Id: I5d63caf41cb55d3077f9a3c00f4f1cce6bbe5ddd

8 years agoMerge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff
Ji Yang [Thu, 26 May 2016 16:12:55 +0000 (16:12 +0000)]
Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff
am: e6c6ca417d

* commit 'e6c6ca417da6f62de4bdebd7b380f12b751a08b7':
  Rename carrier messaging API constant.

Change-Id: I9e2d1c3572a6e7658e6ba66a7d4c01fd4a4c805a

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

* commit 'f7375b46ff9848feba0a9632669d07384954d69e':
  Rename carrier messaging API constant.

Change-Id: I476b10118136b13a49b1d55864bbef8e568d6c7e

8 years agoMerge "Rename carrier messaging API constant." 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

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 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 "DO NOT MERGE Remove Pointer Capture API" into nyc-dev am: c396f0f70e
Michael Wright [Thu, 26 May 2016 15:02:50 +0000 (15:02 +0000)]
Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev am: c396f0f70e
am: 28984d4d80

* commit '28984d4d80affa52324f4c17caae30c6bc3bc3ab':

Change-Id: I4cd9b6ffa87be709845c7531cacac10978664f4e

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 "DO NOT MERGE Remove Pointer Capture API" into nyc-dev am: c396f0f70e
Michael Wright [Thu, 26 May 2016 14:51:30 +0000 (14:51 +0000)]
Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev am: c396f0f70e
am: 4f6ae7bbaa

* commit '4f6ae7bbaa4654e14d70e9fa503ceb713c90c342':
  DO NOT MERGE Remove Pointer Capture API

Change-Id: Ieceb1c9248bfc618ed1c70821d4cf746128bc679

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 "DO NOT MERGE Remove Pointer Capture API" into nyc-dev
Michael Wright [Thu, 26 May 2016 14:39:03 +0000 (14:39 +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: Iede50a709849ed27cb9723a565b946e00fb23be7

8 years agoMerge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev
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

8 years agoMerge "Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4...
Android Build Merger (Role) [Thu, 26 May 2016 14:37:23 +0000 (14:37 +0000)]
Merge "Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4 am: 9b22e5b4e8" into nyc-mr1-dev-plus-aosp