OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Adding docsui prefix to access metric tags." into nyc-dev
Ben Lin [Mon, 6 Jun 2016 18:08:07 +0000 (18:08 +0000)]
Merge "Adding docsui prefix to access metric tags." into nyc-dev
am: de862e1cc8

* commit 'de862e1cc82d96d22394201cb8867b643e4f2e93':
  Adding docsui prefix to access metric tags.

Change-Id: Id3dc690e4f753af51acb406565c643d2fdc01ec1

8 years agoMerge "Adding docsui prefix to access metric tags." into nyc-dev
Ben Lin [Mon, 6 Jun 2016 18:04:11 +0000 (18:04 +0000)]
Merge "Adding docsui prefix to access metric tags." into nyc-dev

8 years agoMerge "New non-priv prebuilt" into nyc-dev
Todd Kennedy [Mon, 6 Jun 2016 16:45:57 +0000 (16:45 +0000)]
Merge "New non-priv prebuilt" into nyc-dev
am: 262ff10eb2

* commit '262ff10eb2d373e95677d2c9bead794dc4a43805':
  New non-priv prebuilt

Change-Id: Ifc6f3b0292b9919d24f79d8cd8193845c72aa1ff

8 years agoMerge "New non-priv prebuilt" into nyc-dev
Todd Kennedy [Mon, 6 Jun 2016 16:42:30 +0000 (16:42 +0000)]
Merge "New non-priv prebuilt" into nyc-dev

8 years agoNew non-priv prebuilt
Todd Kennedy [Mon, 6 Jun 2016 16:38:49 +0000 (09:38 -0700)]
New non-priv prebuilt

Need to target API 24 and not 'N'

Bug: 29116156
Change-Id: Iec215f41147ca13e955b02dc57eaabee89589cf0

8 years agoPackageManager: Rename foreign use markers on app installation.
Narayan Kamath [Mon, 6 Jun 2016 16:11:51 +0000 (16:11 +0000)]
PackageManager: Rename foreign use markers on app installation.
am: 110a12dff1

* commit '110a12dff13276baa12e8587449a1a7f3a318451':
  PackageManager: Rename foreign use markers on app installation.

Change-Id: I9b3450fe63781dff6c7b36053019a98e135ca71d

8 years agoPackageManager: Dexopt core-apps during service bringup.
Narayan Kamath [Mon, 6 Jun 2016 15:24:01 +0000 (15:24 +0000)]
PackageManager: Dexopt core-apps during service bringup.
am: 258aa3e56b

* commit '258aa3e56b02b95e8e855ef949a29babe178b4a5':
  PackageManager: Dexopt core-apps during service bringup.

Change-Id: I2fe2508835b564f8d69a5aa743c6f9ea9f1575cc

8 years agoPackageManager: Rename foreign use markers on app installation.
Narayan Kamath [Thu, 2 Jun 2016 13:01:16 +0000 (14:01 +0100)]
PackageManager: Rename foreign use markers on app installation.

The foreign use markers contain the codePath for a given executable
dex file, so we'll need to rename them when the codePath changes
during an application update. If we don't do this, we might compile
that are used widely across processes (such as GMS core) with
suboptimal filters.

This seems like a messy and brittle design in general, and will be
rewritten post N so that we don't rely on file system topology.

bug: 28998083

Change-Id: Ie4f3995ba52f098edb911b5a388c63696bbd77ac

8 years agoPackageManager: Dexopt core-apps during service bringup.
Narayan Kamath [Wed, 1 Jun 2016 12:56:18 +0000 (13:56 +0100)]
PackageManager: Dexopt core-apps during service bringup.

Code from these apps can be loaded by the system_server and so
we need to make sure they're compiled before their package contexts
are requested. Leaving them interpreted will cause performance issues.

On a Nexus 6P with WITH_DEXPREOPT=false, this adds an additional
26 seconds to every upgrade / first-boot and ends up optimizing a total
of 20 apps.

bug: 28639246
Change-Id: Ief3c0048fda4f1b1742fbf3e2476e65fa607a18a

8 years agoMerge "Include network name in validation logs for dumpsys" into nyc-dev
Paul Jensen [Mon, 6 Jun 2016 11:23:51 +0000 (11:23 +0000)]
Merge "Include network name in validation logs for dumpsys" into nyc-dev
am: 916f79882d

* commit '916f79882d7867d27fbd7abb32ec53028d9d3951':
  Include network name in validation logs for dumpsys

Change-Id: Ic5345cb7f309e509c7b9d7cb7b7ec4b95b8f1102

8 years agoMerge "Include network name in validation logs for dumpsys" into nyc-dev
Paul Jensen [Mon, 6 Jun 2016 11:08:44 +0000 (11:08 +0000)]
Merge "Include network name in validation logs for dumpsys" into nyc-dev

8 years agoMerge "Fix that fail to setup any vpn after Network Settings reset and always-on...
Victor Chang [Mon, 6 Jun 2016 10:30:42 +0000 (10:30 +0000)]
Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev
am: 265f4113ee

* commit '265f4113ee42e89f324b087a81044a9f1dab457e':
  Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on

Change-Id: I86a8f5c9b2dbd8ea71bdc8fb6268f3d9dc7e329d

8 years agoMerge "Fix that fail to setup any vpn after Network Settings reset and always-on...
Robin Lee [Mon, 6 Jun 2016 10:10:54 +0000 (10:10 +0000)]
Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev

8 years agoFix issue #29006049: Add logging for implicit broadcasts
Dianne Hackborn [Sun, 5 Jun 2016 18:17:01 +0000 (18:17 +0000)]
Fix issue #29006049: Add logging for implicit broadcasts
am: bc02a3901d

* commit 'bc02a3901dea52d236dd855722191155156cb856':
  Fix issue #29006049: Add logging for implicit broadcasts

Change-Id: Ifd88a4ce68bd9c2853d085bb10f74df682ae8ee6

8 years agoFix issue #29006049: Add logging for implicit broadcasts
Dianne Hackborn [Fri, 3 Jun 2016 00:15:08 +0000 (17:15 -0700)]
Fix issue #29006049: Add logging for implicit broadcasts

We now have stats on broadcasts.  We collect them over a day and
then reset, retaining the last days stats.  When a checkin happens,
we return either the last day or the current stats and then clear
them.  Not bothing to persist anything to storage, this data is
not that critical.

Change-Id: I1c3b331bcd03f79fa5e10575d9bc2ad7d9104f6f

8 years agoMerge "cold sim clean up" into nyc-mr1-dev
Chen Xu [Sat, 4 Jun 2016 05:48:46 +0000 (05:48 +0000)]
Merge "cold sim clean up" into nyc-mr1-dev

8 years agoFix delayed light status bar animation
Jorim Jaggi [Thu, 5 May 2016 23:25:43 +0000 (16:25 -0700)]
Fix delayed light status bar animation

Make sure to do another layout when we show the dim layer so PWM
can pick up the change and send it to SysUI.

Bug: 28434629
Change-Id: I877669ede8534601933043f60c8cef8502918c7b

8 years agoMerge "Add new attributes for wallpaper info" into nyc-mr1-dev
TreeHugger Robot [Sat, 4 Jun 2016 00:22:05 +0000 (00:22 +0000)]
Merge "Add new attributes for wallpaper info" into nyc-mr1-dev

8 years agoAdd new attributes for wallpaper info
Jorim Jaggi [Tue, 24 May 2016 07:29:19 +0000 (00:29 -0700)]
Add new attributes for wallpaper info

Adjust test wallpaper to use these attributes.

Also fix some issues where wallpaper got laid out differently in the preview
mode.

Bug: 28770685
Change-Id: I259f3884f5f2c0b723a6a5ce012d45170f64c4c7

8 years agoMerge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev
George Mount [Fri, 3 Jun 2016 22:22:52 +0000 (22:22 +0000)]
Merge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev

8 years agoMerge "am/UserController: Log system uptime at two \'boot complete\' markers." into...
James Hawkins [Fri, 3 Jun 2016 22:20:14 +0000 (22:20 +0000)]
Merge "am/UserController: Log system uptime at two \'boot complete\' markers." into nyc-dev
am: eb47d6205f

* commit 'eb47d6205f28d89d8bb1a3e127659dc24727fa7e':
  am/UserController: Log system uptime at two 'boot complete' markers.

Change-Id: I487eaa279cc0054675c722d1c91b82598b4dd45d

8 years agoMerge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev
Selim Cinek [Fri, 3 Jun 2016 22:18:16 +0000 (22:18 +0000)]
Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev
am: 6c94972622

* commit '6c94972622a5fa6c2f0beb16f190015e81584013':
  Fixed a bug where talkback couldn't scroll through notifications

Change-Id: I41bf71eabe7ab90cd93df33c28ac07ad5abd8354

8 years agoMerge "Delete account from DE and CE databases" into nyc-dev
Fyodor Kupolov [Fri, 3 Jun 2016 22:18:15 +0000 (22:18 +0000)]
Merge "Delete account from DE and CE databases" into nyc-dev
am: a087d7f4fa

* commit 'a087d7f4fa6de262aef346acb336fcb826d05d23':
  Delete account from DE and CE databases

Change-Id: Id21fda0bca3c257f5ba8e68fb09a6de47f8f3374

8 years agoMerge "docs: Fix code sample in /work: Set up Single-Purpose Devices am: f4973c28a5...
Billy Lamberta [Fri, 3 Jun 2016 22:18:13 +0000 (22:18 +0000)]
Merge "docs: Fix code sample in /work: Set up Single-Purpose Devices am: f4973c28a5 am: 90ee70e519" into nyc-dev
am: c0b602c441

* commit 'c0b602c441337f9597959a02262de525b1793a94':
  docs: Fix code sample in /work: Set up Single-Purpose Devices

Change-Id: I18a126393bb04d0325946a980f247edd2f3788ad

8 years agoMerge "docs: Update N release notes for DP4" into nyc-dev
Andrew Solovay [Fri, 3 Jun 2016 22:18:11 +0000 (22:18 +0000)]
Merge "docs: Update N release notes for DP4" into nyc-dev
am: e20c1e96fc

* commit 'e20c1e96fc0bb85ad5fe52ec1734c2563886dab0':
  docs: Update N release notes for DP4

Change-Id: Iee292ba0b9f1f1eae2dcaadf58a06b75e4d5c8f3

8 years agoMerge "New prebuilt" into nyc-dev
Todd Kennedy [Fri, 3 Jun 2016 22:17:58 +0000 (22:17 +0000)]
Merge "New prebuilt" into nyc-dev
am: 93b34141b1

* commit '93b34141b1de89a8f176884c3ceb7bc968b252d0':
  New prebuilt

Change-Id: I4a9041473718ae00499dcccb2ccf98204ccfb80a

8 years agoMerge "am/UserController: Log system uptime at two 'boot complete' markers." into...
TreeHugger Robot [Fri, 3 Jun 2016 22:01:02 +0000 (22:01 +0000)]
Merge "am/UserController: Log system uptime at two 'boot complete' markers." into nyc-dev

8 years agoInternal API for cross-task Activity used by assistant.
George Mount [Fri, 27 May 2016 18:02:13 +0000 (11:02 -0700)]
Internal API for cross-task Activity used by assistant.

29091742

A new internal API has been created for use by assistant
to launch an Activity Transition from a non-Activity.

The ActivityOptions are also passed along when using
a spring board Activity so that the shared elements
can be properly synchronized.

This also fixes TransitionManager.endTransition so
that it forces Transitions to end the animations.

Change-Id: Id18d9765bfc0c7b438e17966455aa66d3fa3aeda

8 years agoMerge "Fixed a bug where talkback couldn't scroll through notifications" into nyc-dev
Selim Cinek [Fri, 3 Jun 2016 20:39:23 +0000 (20:39 +0000)]
Merge "Fixed a bug where talkback couldn't scroll through notifications" into nyc-dev

8 years agoFix build after merge.
Jeff Sharkey [Fri, 3 Jun 2016 20:34:16 +0000 (14:34 -0600)]
Fix build after merge.

Change-Id: Iccb1c5a12d453d70eea7e1e3d64d97bc75987bef

8 years agoMerge "Delete account from DE and CE databases" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 20:00:26 +0000 (20:00 +0000)]
Merge "Delete account from DE and CE databases" into nyc-dev

8 years agoMerge commit '44b24c9b38d87dfd8bee2aca381f18a9106313dc' into manual_merge_44b24c9
Jeff Sharkey [Fri, 3 Jun 2016 19:53:48 +0000 (13:53 -0600)]
Merge commit '44b24c9b38d87dfd8bee2aca381f18a9106313dc' into manual_merge_44b24c9

Change-Id: Ie4e0b91f5479f43864b86ff013ff8eb7bed6cd86

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 19:25:16 +0000 (19:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "docs: Fix code sample in /work: Set up Single-Purpose Devices am: f4973c28a5...
Android Build Merger (Role) [Fri, 3 Jun 2016 18:57:23 +0000 (18:57 +0000)]
Merge "docs: Fix code sample in /work: Set up Single-Purpose Devices am: f4973c28a5 am: 90ee70e519" into nyc-dev

8 years agodocs: Fix code sample in /work: Set up Single-Purpose Devices am: f4973c28a5
Billy Lamberta [Fri, 3 Jun 2016 18:56:53 +0000 (18:56 +0000)]
docs: Fix code sample in /work: Set up Single-Purpose Devices am: f4973c28a5
am: 90ee70e519

* commit '90ee70e51927a1cd764bb523f419252547739803':
  docs: Fix code sample in /work: Set up Single-Purpose Devices

Change-Id: I19728a3809efb6c3341fa75678625ad0d617d4d5

8 years agoMerge "docs: Update N release notes for DP4" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 18:48:56 +0000 (18:48 +0000)]
Merge "docs: Update N release notes for DP4" into nyc-dev

8 years agocold sim clean up
fionaxu [Mon, 23 May 2016 23:33:16 +0000 (16:33 -0700)]
cold sim clean up

- add a new field: provisioningNotificationEnabled from NetworkMisc. set
  to false if we want to hide "sign in" notification and placed
  carrier-specific notification instead. it is set on connect, once set,
  it is carrier-app's responsibility to post new UI to users
- rework on the interaction between carrier app and framework
- code cleanup
- unit test support

Bug: 28567303
Change-Id: Ic84db7ffbb920d15344717f104496d3cb82e1a85

8 years agodocs: Fix code sample in /work: Set up Single-Purpose Devices
Billy Lamberta [Fri, 3 Jun 2016 18:32:42 +0000 (18:32 +0000)]
docs: Fix code sample in /work: Set up Single-Purpose Devices
am: f4973c28a5

* commit 'f4973c28a513b117bed6f3b7f5e2ffbd975d4f02':
  docs: Fix code sample in /work: Set up Single-Purpose Devices

Change-Id: I2e2f851ddf9208d3a734913369e8ece1fe199cfe

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 18:10:15 +0000 (18:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agodocs: Fix code sample in /work: Set up Single-Purpose Devices
Billy Lamberta [Thu, 2 Jun 2016 22:52:29 +0000 (15:52 -0700)]
docs: Fix code sample in /work: Set up Single-Purpose Devices

bug: 29095115
Change-Id: I7af38925ce24124d0b48368d9a0436b2d60995b5

8 years agoMerge "New prebuilt" into nyc-dev
Wang Xiaolei [Fri, 3 Jun 2016 18:08:15 +0000 (18:08 +0000)]
Merge "New prebuilt" into nyc-dev

8 years agoMerge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev
Wang Xiaolei [Fri, 3 Jun 2016 18:08:15 +0000 (18:08 +0000)]
Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev

8 years agoDelete account from DE and CE databases
Fyodor Kupolov [Fri, 3 Jun 2016 18:03:03 +0000 (11:03 -0700)]
Delete account from DE and CE databases

When authenticator no longer exists and the user is unlocked, we should
remove accounts from both tables in a single transaction.

Bug: 28910995
Change-Id: Ibabf5d3e5ba561ffb3dda03aef99e358e2f71c58

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Fri, 3 Jun 2016 18:02:46 +0000 (18:02 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 10e29e0730  -s ours

* commit '10e29e0730c21cb8a2cfe74b43792fa3a5705195':
  Import translations. DO NOT MERGE

Change-Id: I52252de40753f1e8b6bc38f738f5385bd1168f73

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Fri, 3 Jun 2016 18:02:42 +0000 (18:02 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 93bc210b3f  -s ours

* commit '93bc210b3f9e9a86074080324162b3a66cac104c':
  Import translations. DO NOT MERGE

Change-Id: If8c66d039bb6cb91fad5011c0f63ca309a80af15

8 years agoMerge "Camera2: Update lensShadingMap documentation" into nyc-dev
Eino-Ville Talvala [Fri, 3 Jun 2016 18:01:57 +0000 (18:01 +0000)]
Merge "Camera2: Update lensShadingMap documentation" into nyc-dev
am: cd44a32dfe

* commit 'cd44a32dfe6a5a39db496af6de7764e164cda6f5':
  Camera2: Update lensShadingMap documentation

Change-Id: I8011b348ebc133ab6664db5948066ded857d5285

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 17:54:20 +0000 (17:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 17:53:25 +0000 (17:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoInclude network name in validation logs for dumpsys
Paul Jensen [Fri, 3 Jun 2016 17:51:21 +0000 (13:51 -0400)]
Include network name in validation logs for dumpsys

Previously this was included in the log messages from NetworkMonitor
but that has been removed (ag/944107), making it frequently impossible
to know what network the logs apply to as there may be no way to
correlate NetIDs to WiFi SSIDs or Cellular networks if the log has wrapped.

Bug: 26075613
Change-Id: I2e3cd41fffb616ab9f855cb16790360bd3414793

8 years agoMerge "Camera2: Update lensShadingMap documentation" into nyc-dev
Eino-Ville Talvala [Fri, 3 Jun 2016 17:51:17 +0000 (17:51 +0000)]
Merge "Camera2: Update lensShadingMap documentation" into nyc-dev

8 years agoNew prebuilt
Todd Kennedy [Fri, 3 Jun 2016 17:16:12 +0000 (10:16 -0700)]
New prebuilt

Need to target API 24 and not 'N'. Also made a small change to the docs

Bug: 29116156
Change-Id: I21c37aa04a4471ca6b3f7727e470129a78f92cf0

8 years agoMerge "Avoid triggering support dialog in non-current user." into nyc-dev
Sudheer Shanka [Fri, 3 Jun 2016 17:14:37 +0000 (17:14 +0000)]
Merge "Avoid triggering support dialog in non-current user." into nyc-dev
am: 5548733eb5

* commit '5548733eb5163ef9f3c642314d2d217503c90d64':
  Avoid triggering support dialog in non-current user.

Change-Id: I223aed76ae1be41cb97582c0fd02d3c4177e59e5

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Fri, 3 Jun 2016 17:14:23 +0000 (17:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 237b52f40c  -s ours

* commit '237b52f40c5564a54a1073df6e77f6da93cdab12':
  Import translations. DO NOT MERGE

Change-Id: I07c0367ff58a8d2852c00b204d72fd7334341dc3

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Fri, 3 Jun 2016 17:14:20 +0000 (17:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 31cd8615b2  -s ours

* commit '31cd8615b2cd7cf04e00a87c7981264c1b180356':
  Import translations. DO NOT MERGE

Change-Id: Ie488bbdd015ab61b80505a10a03d1cf99e1b838e

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Fri, 3 Jun 2016 17:14:18 +0000 (17:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 52edfafb9c  -s ours

* commit '52edfafb9c53d14a5e1de1ecdd3d5b735cecf711':
  Import translations. DO NOT MERGE

Change-Id: Id8f46d8473ac5b77cc8fcd4c09a74b623cc3b91f

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Fri, 3 Jun 2016 17:14:15 +0000 (17:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: f79616b427  -s ours

* commit 'f79616b4277f477985f96f8a486126a389905c7d':
  Import translations. DO NOT MERGE

Change-Id: I35c307deac6f9b0fc01102841cd567a0ec2e4b6f

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Fri, 3 Jun 2016 17:04:14 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: a68d1f10e2  -s ours

* commit 'a68d1f10e2c20e128215406b4d6f4fb835481324':
  Import translations. DO NOT MERGE

Change-Id: I99d55bcb79d0e4e066eb558f887688ea7742eb36

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Fri, 3 Jun 2016 17:04:11 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 2130b28754  -s ours

* commit '2130b287549b010b405bc72d04f07fb1bd070ba5':
  Import translations. DO NOT MERGE

Change-Id: Ieac6c674226e01153395c9cba948b29fc1ba3409

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Fri, 3 Jun 2016 17:04:09 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: ef2989920d  -s ours

* commit 'ef2989920d00f19d5dcd86bd521eec86bc058754':
  Import translations. DO NOT MERGE

Change-Id: I338b7cbfe30f05cceda36cc0cc0a756bcd80ecfc

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Fri, 3 Jun 2016 17:04:05 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 3d9d9fa0d9  -s ours

* commit '3d9d9fa0d97974fc2dbd65ed1bd5b0995b3c347a':
  Import translations. DO NOT MERGE

Change-Id: Ib91f10802f60fc4f7ee9cbe6f1d3df11b46ad37e

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Fri, 3 Jun 2016 17:04:02 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: cace07e727  -s ours

* commit 'cace07e7271723232277e8dfe94799c80926c5ea':
  Import translations. DO NOT MERGE

Change-Id: Ib82f00c78c2e08d1d79430198f7cb505f2b2e334

8 years agoMerge "Avoid triggering support dialog in non-current user." into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 17:02:51 +0000 (17:02 +0000)]
Merge "Avoid triggering support dialog in non-current user." into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 17:00:22 +0000 (17:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:58:49 +0000 (16:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:58:26 +0000 (16:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:58:05 +0000 (16:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:57:49 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:57:44 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:57:27 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:57:21 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:56:56 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:56:40 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:56:15 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:55:56 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:55:38 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:55:20 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:55:01 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:54:39 +0000 (16:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:53:47 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:53:27 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:53:12 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 3 Jun 2016 16:43:50 +0000 (09:43 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Add support for UNSOL PCO Data." into nyc-mr1-dev
Robert Greenwalt [Fri, 3 Jun 2016 16:38:57 +0000 (16:38 +0000)]
Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 3 Jun 2016 16:33:00 +0000 (09:33 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 3 Jun 2016 16:27:25 +0000 (09:27 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 3 Jun 2016 16:16:16 +0000 (09:16 -0700)]
Import translations. DO NOT MERGE

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

8 years agoFix that fail to setup any vpn after Network Settings reset and always-on vpn is on
Victor Chang [Mon, 30 May 2016 19:36:30 +0000 (20:36 +0100)]
Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on

Cause: It revoked the user consent of the vpn app without reseting always-on vpn.
In addition, prepareVpn sets legacy vpn as the current package, the state in
Vpn.class is broken, as it thought the current always-on package is legacy vpn,
(mAlwaysOn is only for app vpn, not for legacy vpn). As a result, prepareVpn rejects
all VpnService.prepare.

Bug: 29031820
Change-Id: Id6bf1d6f38cf134a872811806301b8a602fb5725

8 years agoMerge "Fix BigText transitions" into nyc-dev
Adrian Roos [Fri, 3 Jun 2016 15:53:07 +0000 (15:53 +0000)]
Merge "Fix BigText transitions" into nyc-dev
am: 2ab4f451dc

* commit '2ab4f451dc79c18089fa0bdbba7cdccf5c3c9d47':
  Fix BigText transitions

Change-Id: I4705bacc68842c2a7ed178689e8efa53abc8e235

8 years agoMerge "Fix BigText transitions" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 15:36:10 +0000 (15:36 +0000)]
Merge "Fix BigText transitions" into nyc-dev

8 years agoAvoid triggering support dialog in non-current user.
Sudheer Shanka [Thu, 2 Jun 2016 19:41:42 +0000 (12:41 -0700)]
Avoid triggering support dialog in non-current user.

Bug: 28953755
Change-Id: I3e23a003ec7c8c3d275fa09d6d58f59cc272f617

8 years agoMerge "ShortcutManager: Implement usage report API" into nyc-mr1-dev
Makoto Onuki [Fri, 3 Jun 2016 15:21:44 +0000 (15:21 +0000)]
Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev

8 years agoDon\'t leak guts.
Julia Reynolds [Fri, 3 Jun 2016 13:33:08 +0000 (13:33 +0000)]
Don\'t leak guts.
am: cdf98e1964

* commit 'cdf98e1964489916c68e240bd92c2e0bedab3c2d':
  Don't leak guts.

Change-Id: Id7e53a4e108280c8b843413fa377ae40ea0acb2e

8 years agoDon't leak guts.
Julia Reynolds [Thu, 2 Jun 2016 20:04:56 +0000 (16:04 -0400)]
Don't leak guts.

Change-Id: I7a9080ce4d360ed67b884eb9cbd8597496388389
Fixes: 29064258

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 3 Jun 2016 13:09:07 +0000 (06:09 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 3 Jun 2016 13:04:14 +0000 (06:04 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 3 Jun 2016 13:01:48 +0000 (06:01 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 3 Jun 2016 12:23:35 +0000 (05:23 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 3 Jun 2016 11:57:35 +0000 (04:57 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 3 Jun 2016 11:52:48 +0000 (04:52 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 3 Jun 2016 11:50:16 +0000 (04:50 -0700)]
Import translations. DO NOT MERGE

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