OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge \"Revert \"Improve accessibility window title behavior\"\" into nyc-dev
Phil Weaver [Wed, 8 Jun 2016 02:24:47 +0000 (02:24 +0000)]
Merge \"Revert \"Improve accessibility window title behavior\"\" into nyc-dev
am: fc71309640

Change-Id: Ia2728037f9e610dd49db2bd1a22fd72690bd5340

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 agoMerge \"Check if task was top of stack before it\'s removed\" into nyc-dev
Chong Zhang [Wed, 8 Jun 2016 01:26:10 +0000 (01:26 +0000)]
Merge \"Check if task was top of stack before it\'s removed\" into nyc-dev
am: 94b4029f03

Change-Id: I001916c3c02c016b6240ecb8b16bc545887abefe

8 years agoMerge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev
Chong Zhang [Wed, 8 Jun 2016 01:19:03 +0000 (01:19 +0000)]
Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev
am: 723e5afa9e

Change-Id: I12f294f42e135fc181f585c515cd9ad4589ac1f2

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 \"Duplicate file descriptor when dumping asynchronously.\" into nyc-dev
Felipe Leme [Wed, 8 Jun 2016 01:13:55 +0000 (01:13 +0000)]
Merge \"Duplicate file descriptor when dumping asynchronously.\" into nyc-dev
am: c02ba17898

Change-Id: I8a483e5295a5dccf4f11f76316bf47d962fb8f12

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 agoMerge \"Set fontScale in override config to be equal to global.\" into nyc-dev
Chong Zhang [Wed, 8 Jun 2016 01:04:16 +0000 (01:04 +0000)]
Merge \"Set fontScale in override config to be equal to global.\" into nyc-dev
am: c9adac6abb

Change-Id: I0291db79581d143cabf5f6bbf8a727c2b8c06df6

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 agoMerge \"Fix int overflow in SpannableStringBuilder.replace\" into nyc-dev
Siyamed Sinir [Wed, 8 Jun 2016 00:50:15 +0000 (00:50 +0000)]
Merge \"Fix int overflow in SpannableStringBuilder.replace\" into nyc-dev
am: 96c3e5504b

Change-Id: I98179e88a6ce8838dd84131b9402255920822856

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
Andreas Gampe [Wed, 8 Jun 2016 00:45:35 +0000 (00:45 +0000)]
Merge \"Frameworks/base: Fix FastPrintWriter infinite loop\" into nyc-dev
am: c82a2b5358

Change-Id: I3da283b088e2e0d689ac35d634823497fa2fece1

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 agoMerge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
Jim Miller [Wed, 8 Jun 2016 00:38:31 +0000 (00:38 +0000)]
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
am: 4401e24add

Change-Id: Ic10c6505e4583f487a41eb659227b955013949b7

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 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 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 agoMerge \"Add usage line for dump-profiles\" into nyc-dev
David Sehr [Tue, 7 Jun 2016 23:07:41 +0000 (23:07 +0000)]
Merge \"Add usage line for dump-profiles\" into nyc-dev
am: a85c1e8e69

Change-Id: I301304ff28674e00c8c1d49b968f090838ae64b3

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 agoMinor fixes to distribute cards and fab. am: 5ec3a404fb am: ba9c3d585f am: f5c85abac6
Dirk Dougherty [Tue, 7 Jun 2016 22:57:42 +0000 (22:57 +0000)]
Minor fixes to distribute cards and fab. am: 5ec3a404fb am: ba9c3d585f am: f5c85abac6
am: f91783c8a5

Change-Id: I887922ef823327cb484c113f1b4d85ebf01f9576

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 agoMinor fixes to distribute cards and fab. am: 5ec3a404fb
Dirk Dougherty [Tue, 7 Jun 2016 22:48:17 +0000 (22:48 +0000)]
Minor fixes to distribute cards and fab. am: 5ec3a404fb
am: ba9c3d585f

Change-Id: I6f250c2b9733562e388e2cd81ab9b7c365bb3c9a

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

Change-Id: I47c10ecd60b616bd0f343cb2309820c800d5a077

8 years agoMinor fixes to distribute cards and fab.
Dirk Dougherty [Tue, 7 Jun 2016 22:39:03 +0000 (15:39 -0700)]
Minor fixes to distribute cards and fab.

Change-Id: I125162be9d53faef0c477a2e2592624bb5869ff4

8 years agodocs: Added CL commands for data-saver testing am: b603eae9b3 am: 2d05938af9
Eric Schmidt [Tue, 7 Jun 2016 21:57:52 +0000 (21:57 +0000)]
docs: Added CL commands for data-saver testing am: b603eae9b3 am: 2d05938af9
am: d0ef8a0147

* commit 'd0ef8a01470e83c9161e398b804b5264d71a6bb3':
  docs: Added CL commands for data-saver testing

Change-Id: Ib66755d430ab387f2af39ed127ecaf3c8193b685

8 years agodocs: Added CL commands for data-saver testing am: b603eae9b3
Eric Schmidt [Tue, 7 Jun 2016 21:52:54 +0000 (21:52 +0000)]
docs: Added CL commands for data-saver testing am: b603eae9b3
am: 2d05938af9

* commit '2d05938af9e572ca9582552ad966c18b7b83e94f':
  docs: Added CL commands for data-saver testing

Change-Id: Ic0f9a82f05dc32b162013df51c155f2a1a206c45

8 years agodocs: Added CL commands for data-saver testing
Eric Schmidt [Tue, 7 Jun 2016 21:47:47 +0000 (21:47 +0000)]
docs: Added CL commands for data-saver testing
am: b603eae9b3

* commit 'b603eae9b363ca292d721243819dfd701a194b65':
  docs: Added CL commands for data-saver testing

Change-Id: I1f5bf236f72db694ddedfe6552f188242d5f61a1

8 years agoresolve merge conflicts of ae7641a to nyc-dev-plus-aosp
Pavlin Radoslavov [Tue, 7 Jun 2016 21:41:08 +0000 (14:41 -0700)]
resolve merge conflicts of ae7641a to nyc-dev-plus-aosp

Change-Id: I63d00b98c27d7fa1f30385e030b6ffee5e86dc73

8 years agoMerge "Delay handleEnable() until Bluetooth state is OFF"
Pavlin Radoslavov [Tue, 7 Jun 2016 21:23:23 +0000 (21:23 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF"
am: 98cf9d1a60

* commit '98cf9d1a606e17b5eeedad5fff9bb5935ebb370b':
  Delay handleEnable() until Bluetooth state is OFF

Change-Id: I4461a40459828079ced3b0af313e39825e009bc8

8 years agodocs: Added CL commands for data-saver testing
Eric Schmidt [Tue, 31 May 2016 22:56:48 +0000 (15:56 -0700)]
docs: Added CL commands for data-saver testing

Bug: 28951799
Change-Id: I03ae59b1d98b8e58dc859c8158b318718c8a9f13

8 years agoMerge "Delay handleEnable() until Bluetooth state is OFF"
Treehugger Robot [Tue, 7 Jun 2016 21:14:21 +0000 (21:14 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF"

8 years agoDelay handleEnable() until Bluetooth state is OFF
Pavlin Radoslavov [Thu, 2 Jun 2016 05:25:18 +0000 (22:25 -0700)]
Delay handleEnable() until Bluetooth state is OFF

During shutdown of the Bluetooth stack, if a request to
enable Bluetooth is received, the request is processed immediately.
As a result, we don't let the Bluetooth service to shutdown cleanly,
and the Bluetooth process with the native backend doesn't go away.
This creates various issues in the native backend stack.

Now, after an enable request is received, if necessary we delay
acting on it, until the Bluetooth state is OFF.

Bug: 17723234
Change-Id: I55db4bbd4f45227aa49eae996dcc328f76557a9b
(cherry picked from commit e47ec14318f64c29bf16b5a6bb662bc19206d6b0)

8 years agoMerge "Delete Visualizer before lpJniStorage" am: 03c209b2a3
Eric Laurent [Tue, 7 Jun 2016 18:13:09 +0000 (18:13 +0000)]
Merge "Delete Visualizer before lpJniStorage" am: 03c209b2a3
am: 913e2f83b2

* commit '913e2f83b223486ac1461dab86758848f9ad08e1':
  Delete Visualizer before lpJniStorage

Change-Id: I76aa735d8f0a100e0e106050c90966bd003235bc

8 years agoMerge "Delete Visualizer before lpJniStorage"
ganxiaolin [Tue, 7 Jun 2016 18:07:25 +0000 (18:07 +0000)]
Merge "Delete Visualizer before lpJniStorage"
am: 03c209b2a3

* commit '03c209b2a3544e3a8ca087bb28b99bd623f16098':
  Delete Visualizer before lpJniStorage

Change-Id: Id685a9b6a4735bd2ef34a9d10fba50e37844dc19

8 years agoMerge "Delete Visualizer before lpJniStorage"
Eric Laurent [Tue, 7 Jun 2016 18:00:28 +0000 (18:00 +0000)]
Merge "Delete Visualizer before lpJniStorage"

8 years agoMerge "resolve merge conflicts of b9d266f to nyc-dev-plus-aosp" into nyc-dev-plus...
TreeHugger Robot [Tue, 7 Jun 2016 18:00:24 +0000 (18:00 +0000)]
Merge "resolve merge conflicts of b9d266f to nyc-dev-plus-aosp" into nyc-dev-plus-aosp

8 years agoMerge "Fix getApplicationRestrictions documentation" into nyc-dev
Esteban Talavera [Tue, 7 Jun 2016 17:59:02 +0000 (17:59 +0000)]
Merge "Fix getApplicationRestrictions documentation" into nyc-dev
am: a86d6c4df3

* commit 'a86d6c4df3b193060b4b725e1abfed4f69689843':
  Fix getApplicationRestrictions documentation

Change-Id: Idaab3c8f765d5e5631aa69557a9c3f194c9d5d33

8 years agoMerge "Fix getApplicationRestrictions documentation" into nyc-dev
Esteban Talavera [Tue, 7 Jun 2016 17:55:16 +0000 (17:55 +0000)]
Merge "Fix getApplicationRestrictions documentation" into nyc-dev

8 years agoFix getApplicationRestrictions documentation
Esteban Talavera [Tue, 7 Jun 2016 14:25:20 +0000 (15:25 +0100)]
Fix getApplicationRestrictions documentation

The method never returns null, only empty bundle

Bug: 29178626
Change-Id: Ic53154eafe94c6c501b59932441d7ae1c89cb689

8 years agoAdd usage line for dump-profiles
David Sehr [Tue, 7 Jun 2016 16:11:27 +0000 (09:11 -0700)]
Add usage line for dump-profiles

Previous commit did not include the usage line to be printed when user types
adb shell cmd package

Bug: 28748264
Change-Id: I0a684dbc44c8cc5ec7cd4eba82ce18feed53368c

8 years agoRedirect for AS error message regarding SDK license agreements am: 5fb0843a7f am...
Adarsh Fernando [Tue, 7 Jun 2016 16:10:31 +0000 (16:10 +0000)]
Redirect for AS error message regarding SDK license agreements am: 5fb0843a7f am: fc329098d2
am: 79cb94b8d6

* commit '79cb94b8d6f6edcb10744fc81b81d38a0b2edda6':
  Redirect for AS error message regarding SDK license agreements

Change-Id: Id2e257b316587c427bc1cf45b579f1fedee58595

8 years agoRedirect for AS error message regarding SDK license agreements am: 5fb0843a7f
Adarsh Fernando [Tue, 7 Jun 2016 16:04:39 +0000 (16:04 +0000)]
Redirect for AS error message regarding SDK license agreements am: 5fb0843a7f
am: fc329098d2

* commit 'fc329098d29ca24f2607af356cb19d23cafe6788':
  Redirect for AS error message regarding SDK license agreements

Change-Id: I59913b492063dd64c9c4d17784c9711f9d23fbad

8 years agoRedirect for AS error message regarding SDK license agreements
Adarsh Fernando [Tue, 7 Jun 2016 16:01:48 +0000 (16:01 +0000)]
Redirect for AS error message regarding SDK license agreements
am: 5fb0843a7f

* commit '5fb0843a7f276d8f597e8e6337d60e2901afd430':
  Redirect for AS error message regarding SDK license agreements

Change-Id: Ia741036afbe6d28082a63853ca3aaada487f7d53

8 years agoRedirect for AS error message regarding SDK license agreements
Adarsh Fernando [Tue, 7 Jun 2016 03:58:18 +0000 (20:58 -0700)]
Redirect for AS error message regarding SDK license agreements

- error message will provide a link to doc about importing
  license agreements from another workstatio
- Doc currently on TAC, may move to DAC

Change-Id: Iee2839f1dc7b6a5a1fb5a90ad499e1b0cddf5068

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Tue, 7 Jun 2016 03:21:18 +0000 (03:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 2b92ce7aaa  -s ours

* commit '2b92ce7aaa5a0f22a742cd688488c8b8b05ce82b':
  Import translations. DO NOT MERGE

Change-Id: I058751b2d6f3b01944659df2008956518cbef05b

8 years agoFrameworks/base: Update compiled-classes-phone
Andreas Gampe [Tue, 7 Jun 2016 03:21:14 +0000 (03:21 +0000)]
Frameworks/base: Update compiled-classes-phone
am: e16dc04bd8

* commit 'e16dc04bd82464a289eb00f807293c1da33c179c':
  Frameworks/base: Update compiled-classes-phone

Change-Id: I93ae930e1154c523169f144c90918fd07b198f86

8 years agoMerge "Frameworks/base: Update preloaded-classes" into nyc-dev
Andreas Gampe [Tue, 7 Jun 2016 03:17:06 +0000 (03:17 +0000)]
Merge "Frameworks/base: Update preloaded-classes" into nyc-dev
am: ba94385e5f

* commit 'ba94385e5f8af1556755a7fa5c8e9c3bcb3e5fb0':
  Frameworks/base: Update preloaded-classes

Change-Id: I2c918b2207331cad8d2904f4f314cf9490c4ccac

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 7 Jun 2016 03:13:21 +0000 (03:13 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoFrameworks/base: Update compiled-classes-phone
Andreas Gampe [Sat, 4 Jun 2016 00:40:34 +0000 (17:40 -0700)]
Frameworks/base: Update compiled-classes-phone

Another update.

Bug: 27248115
Change-Id: Ia208b37e9b9b649215ad1024ba0438627bc89f8a

8 years agoMerge "Frameworks/base: Update preloaded-classes" into nyc-dev
TreeHugger Robot [Tue, 7 Jun 2016 03:09:54 +0000 (03:09 +0000)]
Merge "Frameworks/base: Update preloaded-classes" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Tue, 7 Jun 2016 02:27:55 +0000 (02:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: f3d2c06146  -s ours

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

Change-Id: I45a645fa1affcb646938ae71710634a87008464c

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Tue, 7 Jun 2016 02:27:48 +0000 (02:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 93e807485e  -s ours

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

Change-Id: Ib8d00f5d63a48aa529393edc29c226c11824c476

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

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 7 Jun 2016 02:21:44 +0000 (02:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 7 Jun 2016 01:38:01 +0000 (18:38 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 6 Jun 2016 23:00:06 +0000 (16:00 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 6 Jun 2016 22:28:06 +0000 (15:28 -0700)]
Import translations. DO NOT MERGE

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

8 years agodocs: Update Android Dashboard for June 2016 am: ab59c24004 am: b3ad0e05a8
Joe Fernandez [Mon, 6 Jun 2016 22:18:19 +0000 (22:18 +0000)]
docs: Update Android Dashboard for June 2016 am: ab59c24004 am: b3ad0e05a8
am: 91131f459c

* commit '91131f459c490d735ccc57392c6e4ccac667826e':
  docs: Update Android Dashboard for June 2016

Change-Id: Ic79c27b483f664d6d365bbfa1c912c12a8f6c2d0

8 years agodocs: Update Android Dashboard for June 2016 am: ab59c24004
Joe Fernandez [Mon, 6 Jun 2016 22:13:10 +0000 (22:13 +0000)]
docs: Update Android Dashboard for June 2016 am: ab59c24004
am: b3ad0e05a8

* commit 'b3ad0e05a82cb53678a0fdbbcd45ed09b0cfdeed':
  docs: Update Android Dashboard for June 2016

Change-Id: I81e5cf24ecb6616ac4d6f89a160dfba0c5fba7a0

8 years agodocs: Update Android Dashboard for June 2016
Joe Fernandez [Mon, 6 Jun 2016 22:08:01 +0000 (22:08 +0000)]
docs: Update Android Dashboard for June 2016
am: ab59c24004

* commit 'ab59c240040448a51b3cb3b3cd8ec97e96cf6d80':
  docs: Update Android Dashboard for June 2016

Change-Id: If7daf8d73b8653b02f6f3f682c136947f25bec80

8 years agoFrameworks/base: Update preloaded-classes
Andreas Gampe [Sat, 4 Jun 2016 00:24:05 +0000 (17:24 -0700)]
Frameworks/base: Update preloaded-classes

Another update.

Bug: 27248115
Change-Id: Ie0c3b8624a0f43c400a71759c176c02c56d270af

8 years agodocs: Update Android Dashboard for June 2016
Joe Fernandez [Mon, 6 Jun 2016 21:56:23 +0000 (14:56 -0700)]
docs: Update Android Dashboard for June 2016

Change-Id: Iec84a33d5bc456e5feaf7dcee0880035c9b7c559

8 years agoMerge "TIF: Set the surface secure" into nyc-dev
Jae Seo [Mon, 6 Jun 2016 20:01:14 +0000 (20:01 +0000)]
Merge "TIF: Set the surface secure" into nyc-dev
am: 9675f16bba

* commit '9675f16bba6837840038aea92e9db5893cecd33e':
  TIF: Set the surface secure

Change-Id: Ic70459cd294453907ce573c55ca0f16868177789

8 years agoadd redirect for removed dupe logcat page per: https://critique.corp.google.com/...
smain@google.com [Mon, 6 Jun 2016 19:55:48 +0000 (19:55 +0000)]
add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576 am: 7573c42dbe am: 78483fdc3d
am: 894e7b6f78

* commit '894e7b6f78cf9f336242d3b75c99a448e232f4da':
  add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576

Change-Id: I70c01a28d69d2300b59df49e6bd1efe59819f3d7

8 years agoMerge "TIF: Set the surface secure" into nyc-dev
Jae Seo [Mon, 6 Jun 2016 19:55:28 +0000 (19:55 +0000)]
Merge "TIF: Set the surface secure" into nyc-dev

8 years agoadd redirect for removed dupe logcat page per: https://critique.corp.google.com/...
smain@google.com [Mon, 6 Jun 2016 19:51:08 +0000 (19:51 +0000)]
add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576 am: 7573c42dbe
am: 78483fdc3d

* commit '78483fdc3d624401f32f9574d1800a6ccbf09428':
  add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576

Change-Id: Ia027c9e91353b781f0a8334527bed4e6528e7c35

8 years agoadd redirect for removed dupe logcat page per: https://critique.corp.google.com/...
smain@google.com [Mon, 6 Jun 2016 19:45:55 +0000 (19:45 +0000)]
add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576
am: 7573c42dbe

* commit '7573c42dbed65334ef3d86a06dd861a01f6d0ed4':
  add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576

Change-Id: I8c81af0e1aab745ed10dbc8916edd22e7d3dd1a9

8 years agoadd redirect for removed dupe logcat page
smain@google.com [Mon, 6 Jun 2016 19:39:06 +0000 (12:39 -0700)]
add redirect for removed dupe logcat page
per: https://critique.corp.google.com/#review/122118806
bug: 29122576

Change-Id: Icf4f559bb7d246d4f340c15a55580e9248806cee

8 years agoMerge "DOCS: Updated Java 8 language support list with Type Annotations." into nyc-dev
Adarsh Fernando [Mon, 6 Jun 2016 19:35:47 +0000 (19:35 +0000)]
Merge "DOCS: Updated Java 8 language support list with Type Annotations." into nyc-dev
am: 90eece4a77

* commit '90eece4a7765c6574c9e5b21b258bff69e32fa4b':
  DOCS: Updated Java 8 language support list with Type Annotations.

Change-Id: Ic27ef8a9625cd0d6cc2d892b170df8f744c840b0

8 years agoMerge "DOCS: Updated Java 8 language support list with Type Annotations." into nyc-dev
Adarsh Fernando [Mon, 6 Jun 2016 19:30:52 +0000 (19:30 +0000)]
Merge "DOCS: Updated Java 8 language support list with Type Annotations." into nyc-dev

8 years agoMerge "migrate documents UI tests to use AndroidJUnitRunner" into nyc-dev
Guang Zhu [Mon, 6 Jun 2016 19:27:54 +0000 (19:27 +0000)]
Merge "migrate documents UI tests to use AndroidJUnitRunner" into nyc-dev
am: 56cf05291e

* commit '56cf05291e1ffb54025a47ccb046f44c2d05ef14':
  migrate documents UI tests to use AndroidJUnitRunner

Change-Id: Ibc04084e8123a0e0bfe9cbe1c34a1a767dde03ab

8 years agoMerge "migrate documents UI tests to use AndroidJUnitRunner" into nyc-dev
Guang Zhu [Mon, 6 Jun 2016 19:22:31 +0000 (19:22 +0000)]
Merge "migrate documents UI tests to use AndroidJUnitRunner" into nyc-dev

8 years agoMerge "Adding docsui prefix to access metric tags." into nyc-dev
Ben Lin [Mon, 6 Jun 2016 18:08:20 +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: I74cae4f5a7b89411b0e7ebcee348ee05c1cc15f2

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 agoresolve merge conflicts of b9d266f to nyc-dev-plus-aosp
Xin Li [Mon, 6 Jun 2016 17:48:59 +0000 (10:48 -0700)]
resolve merge conflicts of b9d266f to nyc-dev-plus-aosp

Change-Id: I1580d3c108d1f0b57f75b27d67e229f8b314a72a

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

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

Change-Id: Ibe03eddd5f0aaa7d06bfa0a0afc38fad1f5e10ac

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:53 +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: Ic0222814d5acf67f4808adb7a07b884c3cace9b5

8 years agomigrate documents UI tests to use AndroidJUnitRunner
Guang Zhu [Mon, 6 Jun 2016 15:24:31 +0000 (11:24 -0400)]
migrate documents UI tests to use AndroidJUnitRunner

The runner replaces deprecated InstrumentationTestRunner, provides
equivalent functionality, and in addition support JUnit4, sharding
and per test method timeout.

Change-Id: I1c76996d347d3f0f378997f5e7b871279c2b032f

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

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

Change-Id: I15f177dc4fb5c5f6374982cd42eb606650818e81

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 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 agoMerge "Include network name in validation logs for dumpsys" into nyc-dev
Paul Jensen [Mon, 6 Jun 2016 11:23:57 +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: I157481d338e65d7e89e4f97382f84ab2a3110e20

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:33:00 +0000 (10:33 +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: Iba3df72496f067c5e0291449be3bfbd9ce2031ff

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 agoDelete Visualizer before lpJniStorage
ganxiaolin [Mon, 6 Jun 2016 03:09:05 +0000 (11:09 +0800)]
Delete Visualizer before lpJniStorage

It is related to Change: Id17bea8a6ca7132042b9bfefed398a715c139be7
Fix ANR because of bug of Visualizer.
If lpJniStorage was delete first, callback_data_lock become a invalid value.
At mReceiver.periodicCapture() in CaptureThread, it will lock callback_data_lock.
Thus, CaptureThread will wait a invalid memory forever and visualizer wait CaptureThread exiting and causing ANR.

Signed-off-by: ganxiaolin <ganxiaolin@xiaomi.com>
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: I291b4639b55b690ff6e817f87aee5d69986fbe3b

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 agoDOCS: Updated Java 8 language support list with Type Annotations.
Adarsh Fernando [Thu, 2 Jun 2016 18:14:30 +0000 (11:14 -0700)]
DOCS: Updated Java 8 language support list with Type Annotations.

Change-Id: I88773fbf1ce884bd625b3db72c36765871bb9fcc

8 years agoMove legacy full disk encryption code to Settings.
Jim Miller [Sat, 4 Jun 2016 01:39:16 +0000 (18:39 -0700)]
Move legacy full disk encryption code to Settings.

Fixes bug 27617297

Change-Id: I59455cc1fc46949348d2922834724ab40c14f886

8 years agoFix int overflow in SpannableStringBuilder.replace
Siyamed Sinir [Fri, 3 Jun 2016 23:22:17 +0000 (16:22 -0700)]
Fix int overflow in SpannableStringBuilder.replace

During the offset calculation for selection, SpannableStringBuilder
had an overflow while multiplying two int values. This CL uses long to
calculate the multiplication, and also checks for overflow after
casting the final result into int again.

Bug: 29108549
Change-Id: I11eff4677916701074b38bc5214730fe704707c4

8 years agoMerge "am/UserController: Log system uptime at two \'boot complete\' markers." into...
James Hawkins [Fri, 3 Jun 2016 22:06:41 +0000 (22:06 +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: I4846c21cb7623c5528ebd51f8bc95d55b40d8536

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 agoCheck if task was top of stack before it's removed
Chong Zhang [Fri, 3 Jun 2016 21:38:33 +0000 (14:38 -0700)]
Check if task was top of stack before it's removed

To decide if home stack should be brought foreward. If the app is
finishing, it's no longer considered "running" and cleanUpActivityLocked
could move focus to the activity below. Then removeActivityFromHistoryLocked
would fail to bring front home stack as the removed task is no longer top.

bug: 29030518
Change-Id: I887e7c226258651d887cb0a4a6c6caab0a04e6e6

8 years agoMerge "Fixes the system server crash issues caused by null pointer in NetworkPolicyMa...
songjinshi [Fri, 3 Jun 2016 21:32:03 +0000 (21:32 +0000)]
Merge "Fixes the system server crash issues caused by null pointer in NetworkPolicyManagerService."
am: 7211131e23

* commit '7211131e238920db03c83f0c2c21f3c135a7e44f':
  Fixes the system server crash issues caused by null pointer in NetworkPolicyManagerService.

Change-Id: Ifd70b0232fba8d1c8fe2e87b2ca95985d3c0681c