OSDN Git Service

android-x86/frameworks-base.git
8 years agoQS: Fix crash when removing pages in RTL
Jason Monk [Thu, 9 Jun 2016 13:59:56 +0000 (09:59 -0400)]
QS: Fix crash when removing pages in RTL

Change-Id: Ic8f082a3dc61fbf12f576d4cffb8ab31e669cb7c
Fixes: 29122756

8 years agoPackageManagerService: fix NPE while renaming foreign dex markers.
Narayan Kamath [Tue, 7 Jun 2016 08:31:55 +0000 (09:31 +0100)]
PackageManagerService: fix NPE while renaming foreign dex markers.

The User passed in to scan*LI is null during the initial boot scan
and maybeRenameForeignDexMarkers wasn't expecting it. We attempt to
rename markers for all users if that happens.

bug: 29167406
Change-Id: I892dcc542e75d62d72c062b8ce5506ef85df5fc2

8 years agoMerge "Don't depend directly on AppplicationInfo" into nyc-dev
TreeHugger Robot [Thu, 9 Jun 2016 06:22:19 +0000 (06:22 +0000)]
Merge "Don't depend directly on AppplicationInfo" into nyc-dev

8 years agoMerge "Simplify code paths computation, allow adb root to dump" into nyc-dev
David Sehr [Thu, 9 Jun 2016 05:20:19 +0000 (05:20 +0000)]
Merge "Simplify code paths computation, allow adb root to dump" into nyc-dev

8 years agoDon't depend directly on AppplicationInfo
Chad Brubaker [Wed, 8 Jun 2016 19:57:46 +0000 (12:57 -0700)]
Don't depend directly on AppplicationInfo

ApplicationInfo is mutable and unfortunately some apps do actually
modify the flags. Due to the lazy loading nature of the network security
config this may lead to issues. Instead cache the needed flags and
resources at application startup.

Bug: 29063413

(cherry picked from commit 276ee969be89ba25e439839341953236adf80c40)

Change-Id: If638a716fd903b4e9dbabcbecb38bd4e26fef08c

8 years agoMerge "Throw proper exception in ResourcesManager" into nyc-dev
TreeHugger Robot [Thu, 9 Jun 2016 03:45:19 +0000 (03:45 +0000)]
Merge "Throw proper exception in ResourcesManager" into nyc-dev

8 years agoMerge \\"DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.\\" into cw-e-dev...
Erik Wolsheimer [Thu, 9 Jun 2016 03:42:27 +0000 (03:42 +0000)]
Merge \\"DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.\\" into cw-e-dev am: eae242cfe8  -s ours
am: 8b04b0db2e  -s ours

Change-Id: I459eec39aa68d4e165264189ce051bc8b4253965

8 years agoMerge \"DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.\" into cw-e-dev
Erik Wolsheimer [Thu, 9 Jun 2016 03:37:02 +0000 (03:37 +0000)]
Merge \"DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.\" into cw-e-dev
am: eae242cfe8  -s ours

Change-Id: Ia418392bcbab16d2c02689fdc79138b1cee304ab

8 years agoMerge "DO NOT MERGE ANYWHERE Fix NPE when UID has no packages." into cw-e-dev
Erik Wolsheimer [Thu, 9 Jun 2016 03:25:42 +0000 (03:25 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix NPE when UID has no packages." into cw-e-dev

8 years agoDO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5...
fionaxu [Thu, 9 Jun 2016 02:39:15 +0000 (02:39 +0000)]
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5  -s ours am: e1ca4cd074  -s ours am: 0e64d7411e am: eb53629bf7 am: 16dfcd7950  -s ours am: 2d03c0f956 am: dc9a7c7b23 am: e892848035
am: 7e2c6c3440  -s ours

Change-Id: Ic463b8a7a1a1ea537f1fea4fd36dd176464ac789

8 years agoMerge "resolve merge conflicts of afed6f8 to nyc-dev" into nyc-dev
Chen Xu [Thu, 9 Jun 2016 02:32:51 +0000 (02:32 +0000)]
Merge "resolve merge conflicts of afed6f8 to nyc-dev" into nyc-dev

8 years agoMerge \\"docs: Documented how to handle alarms in AA media apps.\\" into mnc-io-docs...
Sreevani Sreejith [Thu, 9 Jun 2016 02:28:58 +0000 (02:28 +0000)]
Merge \\"docs: Documented how to handle alarms in AA media apps.\\" into mnc-io-docs am: 21d6abf7be
am: 539b6b7580

Change-Id: I92cd1c4193e9e8920f28f3300d28bdc8bb6b04cd

8 years agoMerge \"docs: Documented how to handle alarms in AA media apps.\" into mnc-io-docs
sreevanis [Thu, 9 Jun 2016 02:23:30 +0000 (02:23 +0000)]
Merge \"docs: Documented how to handle alarms in AA media apps.\" into mnc-io-docs
am: 21d6abf7be

Change-Id: Id05d99983414d3884c0c90fb67eec224ca77c80b

8 years agoMerge "docs: Documented how to handle alarms in AA media apps." into mnc-io-docs
Sreevani Sreejith [Thu, 9 Jun 2016 02:15:38 +0000 (02:15 +0000)]
Merge "docs: Documented how to handle alarms in AA media apps." into mnc-io-docs

8 years agodocs: Documented how to handle alarms in AA media apps.
sreevanis [Fri, 3 Jun 2016 19:43:52 +0000 (12:43 -0700)]
docs: Documented how to handle alarms in AA media apps.

Bug:27708785
Change-Id: Iee2a676fd8adbcba00301932d5e5637ee21df224

8 years agoMerge "Always re-enable keyguard state when the user switches." into nyc-dev
TreeHugger Robot [Thu, 9 Jun 2016 01:38:31 +0000 (01:38 +0000)]
Merge "Always re-enable keyguard state when the user switches." into nyc-dev

8 years agoMerge "Revert "Temporarily increase timeout for devices with buggy driver"" into...
TreeHugger Robot [Thu, 9 Jun 2016 00:28:52 +0000 (00:28 +0000)]
Merge "Revert "Temporarily increase timeout for devices with buggy driver"" into nyc-dev

8 years agoThrow proper exception in ResourcesManager
Adam Lesinski [Thu, 9 Jun 2016 00:19:09 +0000 (17:19 -0700)]
Throw proper exception in ResourcesManager

In M we would bubble up a NameNotFoundException when failing
to load an assetmanager from another application. We switched
to throwing an IllegalArgumentException, which isn't something
anyone should handle.

This change has ResourcesManager throw Resources.NotFoundException,
which callers like ApplicationPackageManager can catch and rethrow
with the appropriate checked exception. This adds more detail to
errors than we had in M.

Bug:28876344
Change-Id: I250aeef8a4ccfd90c6abef2243edc1c5337ebde9

8 years agoresolve merge conflicts of afed6f8 to nyc-dev
fionaxu [Wed, 8 Jun 2016 23:05:56 +0000 (16:05 -0700)]
resolve merge conflicts of afed6f8 to nyc-dev

Bug: 28557603
Change-Id: Icb19f3d031cce2d846d5f6e9ad4d28d002db6bac

8 years agoForcing software in header button background ripples.
Winson [Wed, 8 Jun 2016 19:57:40 +0000 (12:57 -0700)]
Forcing software in header button background ripples.

Bug: 29133575
Change-Id: I21125e28208335f5b2c2adf06cb1c8199b3ca476

8 years agoMerge "Consume the first sample of KernelUidCpuTimeReader" into nyc-dev
TreeHugger Robot [Wed, 8 Jun 2016 22:49:23 +0000 (22:49 +0000)]
Merge "Consume the first sample of KernelUidCpuTimeReader" into nyc-dev

8 years agoMerge "Teach persistable Uri grants about direct boot" into nyc-dev
Svetoslav Ganov [Wed, 8 Jun 2016 21:54:39 +0000 (21:54 +0000)]
Merge "Teach persistable Uri grants about direct boot" into nyc-dev

8 years agoConsume the first sample of KernelUidCpuTimeReader
Adam Lesinski [Wed, 8 Jun 2016 21:19:09 +0000 (14:19 -0700)]
Consume the first sample of KernelUidCpuTimeReader

If the system_server crashes, when it starts back up
it will assume that the entries in kernelUidCpuTimeReader
are all fresh and we will end up double counting cpu time
and power.

Bug:29163081
Change-Id: I73e693199c170229af57efd610950e90263ac9bc

8 years agoAS UI redirect for experimental to stable Gradle migration guide am: c65f7e8071
Adarsh Fernando [Wed, 8 Jun 2016 21:18:02 +0000 (21:18 +0000)]
AS UI redirect for experimental to stable Gradle migration guide am: c65f7e8071
am: 28f355bb63

Change-Id: I5efe04ef8a2c7c3d7a226ee91beca0f89e48be37

8 years agoAS UI redirect for experimental to stable Gradle migration guide
Adarsh Fernando [Wed, 8 Jun 2016 21:12:56 +0000 (21:12 +0000)]
AS UI redirect for experimental to stable Gradle migration guide
am: c65f7e8071

Change-Id: I6ebb598650756de2687b4ab73ef41e27b13c8b1c

8 years agoAS UI redirect for experimental to stable Gradle migration guide
Adarsh Fernando [Wed, 8 Jun 2016 20:42:37 +0000 (13:42 -0700)]
AS UI redirect for experimental to stable Gradle migration guide

- This guide may be moved over to DAC when AS 2.2 goes stable.

Change-Id: Ia29bb75832f01efc8175db45f8fd08d5013d715e

8 years agoMerge "Direct Reply: Add back emoji button" into nyc-dev
Adrian Roos [Wed, 8 Jun 2016 20:24:59 +0000 (20:24 +0000)]
Merge "Direct Reply: Add back emoji button" into nyc-dev

8 years agoSimplify code paths computation, allow adb root to dump
David Sehr [Wed, 8 Jun 2016 17:37:33 +0000 (10:37 -0700)]
Simplify code paths computation, allow adb root to dump

Bug: 28748264
Change-Id: I1aefa5d98e80b58d6ed500c5d2d610569cf25c3a

8 years agoDirect Reply: Add back emoji button
Adrian Roos [Fri, 3 Jun 2016 15:50:23 +0000 (08:50 -0700)]
Direct Reply: Add back emoji button

Bug: 29077108
Change-Id: Ibd1423465c5ec9aced4c4b77575a469f5e85f20d

8 years agoMerge "Ensure pinned animation scaling is consistently applied." into nyc-dev
TreeHugger Robot [Wed, 8 Jun 2016 20:08:37 +0000 (20:08 +0000)]
Merge "Ensure pinned animation scaling is consistently applied." into nyc-dev

8 years agoTeach persistable Uri grants about direct boot
Svet Ganov [Wed, 8 Jun 2016 16:40:47 +0000 (09:40 -0700)]
Teach persistable Uri grants about direct boot

We read the persistable Uri grants on boot at which point
the user is not unlocked. This results in ignoring Uri
grants for boot unaware content providers.

This change reads all persisted Uri grants on boot but
filters them out during query based on the current user
unlock state.

bug:29058113

Change-Id: I2643fc098f42359e72a4c534236debc9b9389256

8 years agoMerge changes I0ca13626,I3677ce54 into nyc-dev
Selim Cinek [Wed, 8 Jun 2016 19:37:39 +0000 (19:37 +0000)]
Merge changes I0ca13626,I3677ce54 into nyc-dev

* changes:
  Fixed a flicker when closing QS without notifications
  Handled expandability and swiping while guts are exposed

8 years agoMerge "QS Edit: Extra extra make sure hidden when locked" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:12:19 +0000 (19:12 +0000)]
Merge "QS Edit: Extra extra make sure hidden when locked" into nyc-dev

8 years agoMerge "QS: Fix leak in QSAnimator" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:12:05 +0000 (19:12 +0000)]
Merge "QS: Fix leak in QSAnimator" into nyc-dev

8 years agoMerge "QS: Show date even on small screens" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:11:40 +0000 (19:11 +0000)]
Merge "QS: Show date even on small screens" into nyc-dev

8 years agoMerge "Fix crash when an app with an active quicksettings tile is updated to no longe...
Jason Monk [Wed, 8 Jun 2016 19:11:15 +0000 (19:11 +0000)]
Merge "Fix crash when an app with an active quicksettings tile is updated to no longer have that tile." into nyc-dev

8 years agoFix crash when an app with an active quicksettings tile is updated to no longer have...
Will Harmon [Mon, 6 Jun 2016 19:54:59 +0000 (12:54 -0700)]
Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.

Fixes: 28721139
Change-Id: Ib53c7cc08e9378420a5fed3459c1e17864b28802

8 years agoMerge "Settings: Better handling for disabled tiles" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:10:08 +0000 (19:10 +0000)]
Merge "Settings: Better handling for disabled tiles" into nyc-dev

8 years agoDO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5...
fionaxu [Wed, 8 Jun 2016 18:41:33 +0000 (18:41 +0000)]
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5  -s ours am: e1ca4cd074  -s ours am: 0e64d7411e am: eb53629bf7 am: 16dfcd7950  -s ours am: 2d03c0f956 am: dc9a7c7b23
am: e892848035

Change-Id: Ic74c9116d505f3f76dd659d7bfd60ded6463f0ed

8 years agoDO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5...
fionaxu [Wed, 8 Jun 2016 18:33:22 +0000 (18:33 +0000)]
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5  -s ours am: e1ca4cd074  -s ours am: 0e64d7411e am: eb53629bf7 am: 16dfcd7950  -s ours am: 2d03c0f956
am: dc9a7c7b23

Change-Id: I0cccd4ba128987959aa0e9324c1f5ab5bb5bc455

8 years agoMerge "Return correct default theme on API >= 24" into nyc-dev
Ian Pedowitz [Wed, 8 Jun 2016 18:27:59 +0000 (18:27 +0000)]
Merge "Return correct default theme on API >= 24" into nyc-dev

8 years agoresolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am...
fionaxu [Wed, 8 Jun 2016 18:24:16 +0000 (18:24 +0000)]
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717 am: c95d552de0
am: c10e4fae05

Change-Id: I8e5e9345aa8eeeae5a7af94a4cac892ee8e558ee

8 years agoDO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5...
fionaxu [Wed, 8 Jun 2016 18:22:46 +0000 (18:22 +0000)]
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5  -s ours am: e1ca4cd074  -s ours am: 0e64d7411e am: eb53629bf7 am: 16dfcd7950  -s ours
am: 2d03c0f956

Change-Id: I9dfe9f73a3762ec0eed0659a7ac04f9980e715bb

8 years agoMerge "Handle alarm firing outside of DND period." into nyc-dev
Julia Reynolds [Wed, 8 Jun 2016 18:19:12 +0000 (18:19 +0000)]
Merge "Handle alarm firing outside of DND period." into nyc-dev

8 years agoresolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am...
fionaxu [Wed, 8 Jun 2016 18:11:09 +0000 (18:11 +0000)]
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717
am: c95d552de0

Change-Id: I4db8cef9678c409b7f0610d98f161e0e048a0333

8 years agoMerge "Wrap closeQuietly() on finally block." into nyc-dev
TreeHugger Robot [Wed, 8 Jun 2016 17:59:47 +0000 (17:59 +0000)]
Merge "Wrap closeQuietly() on finally block." into nyc-dev

8 years agoMerge "Add a separate read permission for oem unlock state" into nyc-dev
Amith Yamasani [Wed, 8 Jun 2016 17:55:39 +0000 (17:55 +0000)]
Merge "Add a separate read permission for oem unlock state" into nyc-dev

8 years agoMerge "Change unit of I/O statistics to MiB" into nyc-dev
Tianjie Xu [Wed, 8 Jun 2016 17:25:15 +0000 (17:25 +0000)]
Merge "Change unit of I/O statistics to MiB" into nyc-dev

8 years agoDO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5...
fionaxu [Wed, 8 Jun 2016 17:23:33 +0000 (17:23 +0000)]
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5  -s ours am: e1ca4cd074  -s ours am: 0e64d7411e am: eb53629bf7
am: 16dfcd7950  -s ours

Change-Id: Ia5003c773216218c4ed2961587fb30f4536d89a7

8 years agoresolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am...
fionaxu [Wed, 8 Jun 2016 17:23:27 +0000 (17:23 +0000)]
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c
am: 698e044717

Change-Id: I5a00c0b206cae8a13f860783756ffa66c08db65d

8 years agoDO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5...
fionaxu [Wed, 8 Jun 2016 17:15:39 +0000 (17:15 +0000)]
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5  -s ours am: e1ca4cd074  -s ours am: 0e64d7411e
am: eb53629bf7

Change-Id: Ie99251c23087ebe648a3450aa2a9fe881cb3c1f8

8 years agoresolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e
fionaxu [Wed, 8 Jun 2016 17:11:49 +0000 (17:11 +0000)]
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e
am: 965084dd0c

Change-Id: I1db27bacdfc0c66ddc28c3d656f1f5cfb98894a8

8 years agoDO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5...
fionaxu [Wed, 8 Jun 2016 17:10:02 +0000 (17:10 +0000)]
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5  -s ours am: e1ca4cd074  -s ours
am: 0e64d7411e

Change-Id: I856719a3bec69549b83507fefcd662ce54104eaf

8 years agoresolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e
fionaxu [Wed, 8 Jun 2016 17:04:09 +0000 (17:04 +0000)]
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e
am: 1e8fe12f4e

Change-Id: I3122c1d81dde1088990bcbd2aff7eea478ead4fc

8 years agoDO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5...
fionaxu [Wed, 8 Jun 2016 16:58:26 +0000 (16:58 +0000)]
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5  -s ours
am: e1ca4cd074  -s ours

Change-Id: Icbb64c652c66c55fcc6e0cf1500af2cfb99fdbb3

8 years agoresolve merge conflicts of 2c53526 to lmp-mr1-dev
fionaxu [Wed, 8 Jun 2016 16:58:13 +0000 (16:58 +0000)]
resolve merge conflicts of 2c53526 to lmp-mr1-dev
am: c196526f8e

Change-Id: Ic0f9fb749282b46d5c41fd36aaab42090ecbd0b9

8 years agoMerge "docs: Updates for picture-in-picture docs for N DP4" into nyc-dev
Dan Yu [Wed, 8 Jun 2016 16:22:26 +0000 (16:22 +0000)]
Merge "docs: Updates for picture-in-picture docs for N DP4" into nyc-dev

8 years agoWrap closeQuietly() on finally block.
Felipe Leme [Wed, 8 Jun 2016 16:12:37 +0000 (09:12 -0700)]
Wrap closeQuietly() on finally block.

BUG: 29123428
Change-Id: Ife7a919343ce4b73eef759bbc87dd37f12a71bca

8 years agoReturn correct default theme on API >= 24
Alan Viverette [Wed, 8 Jun 2016 15:45:15 +0000 (11:45 -0400)]
Return correct default theme on API >= 24

This method was broken, but it was returning light theme on N preview
builds, so we'll keep it consistent as we move into N release.

Bug: 29192690
Change-Id: I0d16abbe48756070dcd653c39d0da4124ea66b28

8 years agoMerge "Make Settings->Apps can handle work apps even work profile not enabled yet...
Ricky Wai [Wed, 8 Jun 2016 14:33:55 +0000 (14:33 +0000)]
Merge "Make Settings->Apps can handle work apps even work profile not enabled yet" into nyc-dev

8 years agoMerge "Fix #29073394: Need to bind to scorer after user is unlocked." into nyc-dev
TreeHugger Robot [Wed, 8 Jun 2016 14:32:42 +0000 (14:32 +0000)]
Merge "Fix #29073394: Need to bind to scorer after user is unlocked." into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:09:24 +0000 (13:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoSettings: Better handling for disabled tiles
Jason Monk [Tue, 7 Jun 2016 18:01:32 +0000 (14:01 -0400)]
Settings: Better handling for disabled tiles

Push disabling into SettingsDrawerActivity and add a blacklist to
make sure they disappear immediately.

Change-Id: I79b9c596373cf9634008f6be88f4808af70eb071
Fixes: 29080209

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:05:46 +0000 (13:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:05:42 +0000 (13:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:05:38 +0000 (13:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:05:36 +0000 (13:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoQS: Fix leak in QSAnimator
Jason Monk [Tue, 7 Jun 2016 20:06:59 +0000 (16:06 -0400)]
QS: Fix leak in QSAnimator

Change-Id: I54f1e083cf6ba6bfb5abc0f416680cbda1401980
Fixes: 29113833

8 years agoMerge "Package changed/removed listeners for always-on VPN" into nyc-dev
TreeHugger Robot [Wed, 8 Jun 2016 10:46:41 +0000 (10:46 +0000)]
Merge "Package changed/removed listeners for always-on VPN" into nyc-dev

8 years agoresolve merge conflicts of 2c53526 to lmp-mr1-dev
fionaxu [Wed, 8 Jun 2016 01:57:12 +0000 (18:57 -0700)]
resolve merge conflicts of 2c53526 to lmp-mr1-dev

Change-Id: I4fe45fae0a98934ac9b0f6f48c8cab8546392641

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 8 Jun 2016 03:49:52 +0000 (20:49 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29169863
Change-Id: Ic7b964650e55d381c9b2f7a18f1358a5cc033d21

8 years agoMerge "Revert "Improve accessibility window title behavior"" into nyc-dev
Phil Weaver [Wed, 8 Jun 2016 02:19:33 +0000 (02:19 +0000)]
Merge "Revert "Improve accessibility window title behavior"" into nyc-dev

8 years agoDO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c
fionaxu [Wed, 8 Jun 2016 02:04:12 +0000 (02:04 +0000)]
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c
am: 84f479f6b5  -s ours

Change-Id: Ia2605d430a9f3fdc1de6a59bb5702f4f65ae3816

8 years agoDO NOT MERGE fix build breakage on k am: 4e33c4f8b1
fionaxu [Wed, 8 Jun 2016 01:59:04 +0000 (01:59 +0000)]
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1
am: 07c994012c

Change-Id: Iba1b8547910292c33b9ce500fd395c95a6bc81e9

8 years agoRevert "Temporarily increase timeout for devices with buggy driver"
Jim Miller [Wed, 8 Jun 2016 01:52:50 +0000 (01:52 +0000)]
Revert "Temporarily increase timeout for devices with buggy driver"

Bug 28201240 has been fixed, reverting workaround

This reverts commit 93d828de59986a990bfd2fffcfc399deae5ba6ba.

Change-Id: Iaa10c63b48dd434badc3f6d2c23859391996abac

8 years agoDO NOT MERGE fix build breakage on k
fionaxu [Wed, 8 Jun 2016 01:49:39 +0000 (01:49 +0000)]
DO NOT MERGE fix build breakage on k
am: 4e33c4f8b1

Change-Id: I0339ec14a342f6c4a8f77638ffc6d4873a368830

8 years agoMerge "Check if task was top of stack before it's removed" into nyc-dev
Chong Zhang [Wed, 8 Jun 2016 01:18:00 +0000 (01:18 +0000)]
Merge "Check if task was top of stack before it's removed" into nyc-dev

8 years agoMerge "Use getActivityToken() instead of mToken in isTopOfTask" into nyc-dev
Chong Zhang [Wed, 8 Jun 2016 01:12:25 +0000 (01:12 +0000)]
Merge "Use getActivityToken() instead of mToken in isTopOfTask" into nyc-dev

8 years agoMerge "Duplicate file descriptor when dumping asynchronously." into nyc-dev
TreeHugger Robot [Wed, 8 Jun 2016 01:08:40 +0000 (01:08 +0000)]
Merge "Duplicate file descriptor when dumping asynchronously." into nyc-dev

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 8 Jun 2016 01:03:04 +0000 (18:03 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29169863
Change-Id: Ieac4df1080a37509c12c420f15e64063e9c15fc4

8 years agoMerge "Set fontScale in override config to be equal to global." into nyc-dev
Chong Zhang [Wed, 8 Jun 2016 00:59:43 +0000 (00:59 +0000)]
Merge "Set fontScale in override config to be equal to global." into nyc-dev

8 years agoDO NOT MERGE fix build breakage on k
fionaxu [Wed, 8 Jun 2016 00:28:39 +0000 (17:28 -0700)]
DO NOT MERGE fix build breakage on k

Bug: 28557603
Change-Id: I3beae9e8cb6315654d7681d484fbb861fa8b1889

8 years agoChange unit of I/O statistics to MiB
Tianjie Xu [Thu, 2 Jun 2016 19:38:17 +0000 (12:38 -0700)]
Change unit of I/O statistics to MiB

I/O in bytes are too large and it may cause overflow. Moreover, data with
large numbers are grouped in the same bucket of the histogram. This adds
difficulty to the analysis. Changing unit of I/O to MiB so that we can
have a better data distribution.

Bug: 28658632
Change-Id: Id9913d71e62b36ce5d5d2e57676953f4dbd0c7c9

8 years agoMerge "Fix int overflow in SpannableStringBuilder.replace" into nyc-dev
Siyamed Sinir [Wed, 8 Jun 2016 00:46:27 +0000 (00:46 +0000)]
Merge "Fix int overflow in SpannableStringBuilder.replace" into nyc-dev

8 years agoMerge "Frameworks/base: Fix FastPrintWriter infinite loop" into nyc-dev
TreeHugger Robot [Wed, 8 Jun 2016 00:38:59 +0000 (00:38 +0000)]
Merge "Frameworks/base: Fix FastPrintWriter infinite loop" into nyc-dev

8 years agoRevert "Improve accessibility window title behavior"
Phil Weaver [Wed, 8 Jun 2016 00:34:40 +0000 (00:34 +0000)]
Revert "Improve accessibility window title behavior"

Bug: 29127065

This reverts commit 2a7e4442bf9892842e0fc7eba9296e8fcf9f8ea5.

Change-Id: Ibc5527cfedd49c685ffd1b8ae59e87ed99c93d39

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 8 Jun 2016 00:32:37 +0000 (17:32 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29169863
Change-Id: I3d2586f7265f533c4b1620349c1a52851b4586e0

8 years agoMerge "Move legacy full disk encryption code to Settings." into nyc-dev
TreeHugger Robot [Wed, 8 Jun 2016 00:31:28 +0000 (00:31 +0000)]
Merge "Move legacy full disk encryption code to Settings." into nyc-dev

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 8 Jun 2016 00:16:36 +0000 (17:16 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29169863
Change-Id: Icab456e7a193fc6099bbd6e7ff207d542e98830e

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 8 Jun 2016 00:02:34 +0000 (17:02 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29169863
Change-Id: I717395f19e8605b4ad4af00b8601ff59c3acb73c

8 years agoHandle alarm firing outside of DND period.
Julia Reynolds [Thu, 2 Jun 2016 16:53:42 +0000 (12:53 -0400)]
Handle alarm firing outside of DND period.

Change-Id: Ib8bb878709ab8b5db8aba7f31e239e44409e18d4
Fixes: 28459870

8 years agoDuplicate file descriptor when dumping asynchronously.
Felipe Leme [Tue, 7 Jun 2016 23:14:07 +0000 (16:14 -0700)]
Duplicate file descriptor when dumping asynchronously.

dumpDbInfo() uses an async task when dumping from the system thread, but
then the file descriptor is closed by the time the task is executed. As
such, the system databases are not dumped.

BUG: 29123428
Change-Id: Ibb8bbe503aa03c3ca13b2b1789f0ead0b869e9d5

8 years agoBackport loadSafeLabel changes am: be2865a60a am: 4c50846519
fionaxu [Tue, 7 Jun 2016 23:23:10 +0000 (23:23 +0000)]
Backport loadSafeLabel changes am: be2865a60a am: 4c50846519
am: 9a825b0fd5

Change-Id: Ie3042058420fbd3018ae238dab4129de58ec69c8

8 years agoBackport loadSafeLabel changes am: be2865a60a
fionaxu [Tue, 7 Jun 2016 23:20:04 +0000 (23:20 +0000)]
Backport loadSafeLabel changes am: be2865a60a
am: 4c50846519

Change-Id: Ia31592def4d88a3a9e92a7e0c9126691c64a5fc4

8 years agoBackport loadSafeLabel changes
fionaxu [Tue, 7 Jun 2016 23:13:08 +0000 (23:13 +0000)]
Backport loadSafeLabel changes
am: be2865a60a

Change-Id: Ifabe996449c534c5085245c4f07e2d865a23e126

8 years agoFrameworks/base: Fix FastPrintWriter infinite loop
Andreas Gampe [Tue, 7 Jun 2016 23:02:23 +0000 (16:02 -0700)]
Frameworks/base: Fix FastPrintWriter infinite loop

Check for error condition in loop.

Bug: 29123428
Change-Id: I361ed27ecb8f05512d7e17f8045f3d34667d32d8

8 years agoMerge "Add usage line for dump-profiles" into nyc-dev
David Sehr [Tue, 7 Jun 2016 23:01:09 +0000 (23:01 +0000)]
Merge "Add usage line for dump-profiles" into nyc-dev

8 years agoSet fontScale in override config to be equal to global.
Chong Zhang [Sat, 4 Jun 2016 00:43:10 +0000 (17:43 -0700)]
Set fontScale in override config to be equal to global.

The default fontScale in EMPTY config is 1.0. This will result in
updateFrom always overriding the fontScale to 1.0 since it's non-zero.

We can't set it to 0.0 either as that will make the override config
not equal to EMPTY. The rest of the code doesn't work well with that.

So here we always set the override fontScale to be idential to global.

bug: 29113700
Change-Id: I1dbe507145b8190a9ae5e108948c833d4e037e1d

8 years agoMinor fixes to distribute cards and fab. am: 5ec3a404fb am: ba9c3d585f
Dirk Dougherty [Tue, 7 Jun 2016 22:53:20 +0000 (22:53 +0000)]
Minor fixes to distribute cards and fab. am: 5ec3a404fb am: ba9c3d585f
am: f5c85abac6

Change-Id: I2ea6f9370725235b9d63f6c5a843e42b09361315

8 years agoBackport loadSafeLabel changes
fionaxu [Fri, 3 Jun 2016 01:49:01 +0000 (18:49 -0700)]
Backport loadSafeLabel changes

Bug:23531798
Bug:28557603
Change-Id: Iee49f7c37d6a42fe74077bb15ed47919d351d172