OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge \"Fix #29073394: Need to bind to scorer after user is unlocked.\" into nyc-dev
Jeremy Joslin [Wed, 8 Jun 2016 14:39:09 +0000 (14:39 +0000)]
Merge \"Fix #29073394: Need to bind to scorer after user is unlocked.\" into nyc-dev
am: 464f7e4983

Change-Id: I40be62c7cb0c5802e9cfa3eb913c899c77d3df0e

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:21:51 +0000 (13:21 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 002ccec5c1  -s ours

Change-Id: I1d774f175bfff7e90b9253fe84222964f5d97677

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

Change-Id: Ia70e5266178ab687bac8299f6609825b54787b3c

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:10:44 +0000 (13:10 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: c20ea2eb43  -s ours

Change-Id: Ide205acdf26a282bd80ca2eb68b23f1a442c36a4

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:10:41 +0000 (13:10 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 64d6fddc4b  -s ours

Change-Id: Ica64b4dbd45e67e8ed9bcad575126aaccb2bbf17

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:10:38 +0000 (13:10 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 2d3c74a2fd  -s ours

Change-Id: I44308cc36bf4f3dde8fe34cd0e225914fa3d602d

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 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 agoMerge \"Package changed/removed listeners for always-on VPN\" into nyc-dev
Robin Lee [Wed, 8 Jun 2016 10:50:42 +0000 (10:50 +0000)]
Merge \"Package changed/removed listeners for always-on VPN\" into nyc-dev
am: ee5e4cc836

Change-Id: I8f7054b5a2ac69677a0e124e9a616b3d58b604af

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 agoMerge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev
TreeHugger Robot [Wed, 8 Jun 2016 06:35:31 +0000 (06:35 +0000)]
Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev

* changes:
  Give WakeupMessage the ability to transport an object as well.
  Don't treat the lingerExpired broadcast specially.
  Add a test for mobile data always on.
  Add a FakeSettingsProvider and use it in ConnectivityServiceTest.

8 years agoGive WakeupMessage the ability to transport an object as well.
Lorenzo Colitti [Tue, 7 Jun 2016 07:27:10 +0000 (16:27 +0900)]
Give WakeupMessage the ability to transport an object as well.

Bug: 23113288
Change-Id: Ic98e3bcb3ea8b0b28a309bd647fb4178311c46a3

8 years agoDon't treat the lingerExpired broadcast specially.
Lorenzo Colitti [Sun, 5 Jun 2016 14:45:25 +0000 (23:45 +0900)]
Don't treat the lingerExpired broadcast specially.

NetworkMonitor no longer uses the broadcast for lingering, it
uses WakeupMessage instead.

Bug: 23113288
Change-Id: Idb0c55fc68cb8f45b3213c7134213904f227852e

8 years agoAdd a test for mobile data always on.
Lorenzo Colitti [Sun, 5 Jun 2016 12:00:23 +0000 (21:00 +0900)]
Add a test for mobile data always on.

Bug: 23113288
Change-Id: Ia8649061a797367d135bb5576600a7cdc85a822e

8 years agoAdd a FakeSettingsProvider and use it in ConnectivityServiceTest.
Lorenzo Colitti [Sat, 4 Jun 2016 17:20:29 +0000 (02:20 +0900)]
Add a FakeSettingsProvider and use it in ConnectivityServiceTest.

This class makes it easier to test code that uses Settings:

1. Real device or emulator settings don't affect the code under
   test; all settings always start off empty.
2. It's possible to change settings from the test without
   affecting system settings.
3. No changes are needed to the code under test. The changes to
   the tests are simple: just add a fake ContentResolver to
   whatever mock Context is already used by the test, and make
   that ContentResolver use the fake provider.

Bug: 23113288
Change-Id: I5e7e5a87571444ae49ccf551705620675a36cd17

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:24:42 +0000 (02:24 +0000)]
Merge \"Revert \"Improve accessibility window title behavior\"\" into nyc-dev
am: fc71309640

Change-Id: I7b0c0636a69e4cc06d525f60d8621879ce45be22

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:27 +0000 (01:26 +0000)]
Merge \"Check if task was top of stack before it\'s removed\" into nyc-dev
am: 94b4029f03

Change-Id: I58b62cd4b61952e82b2e2e6951b0f3a40511a340

8 years agoMerge "Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc...
Android Build Merger (Role) [Wed, 8 Jun 2016 01:23:03 +0000 (01:23 +0000)]
Merge "Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev am: 723e5afa9e" into nyc-mr1-dev

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

Change-Id: Ib739a55588b270e76cdb11c5356fd90c19c644dc

8 years agoMerge "Added a getPrimaryStorageSize() method." into nyc-mr1-dev
TreeHugger Robot [Wed, 8 Jun 2016 01:22:17 +0000 (01:22 +0000)]
Merge "Added a getPrimaryStorageSize() method." into nyc-mr1-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: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:15:06 +0000 (01:15 +0000)]
Merge \"Duplicate file descriptor when dumping asynchronously.\" into nyc-dev
am: c02ba17898

Change-Id: Ief488d02aac6900453e5344959aad8c417d60c8d

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:12 +0000 (01:04 +0000)]
Merge \"Set fontScale in override config to be equal to global.\" into nyc-dev
am: c9adac6abb

Change-Id: If62da650207267872815af6f7e793b193e23d10e

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

Change-Id: Ibac22676dcfcd8874bc2415f7fb4f76849896748

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:34 +0000 (00:45 +0000)]
Merge \"Frameworks/base: Fix FastPrintWriter infinite loop\" into nyc-dev
am: c82a2b5358

Change-Id: I9ff1746643acbbf8663b6e1c5fce553e4f803df4

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:25 +0000 (00:38 +0000)]
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
am: 4401e24add

Change-Id: Ibe8709900618cc5d9c5ca18a88ca6fce8c552d54

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 agoMerge "Fix build break by adding missing parenthesis." into nyc-mr1-dev
Sharvil Nanavati [Tue, 7 Jun 2016 23:43:43 +0000 (23:43 +0000)]
Merge "Fix build break by adding missing parenthesis." into nyc-mr1-dev

8 years agoAdded a getPrimaryStorageSize() method.
Felipe Leme [Thu, 12 May 2016 19:56:28 +0000 (12:56 -0700)]
Added a getPrimaryStorageSize() method.

BUG: 24128505

Change-Id: I0b75d3c5505dadedf5d06868614b3a01765cc5d3

** Cherrypicked from master **

8 years agoFix build break by adding missing parenthesis.
Sharvil Nanavati [Tue, 7 Jun 2016 23:41:16 +0000 (16:41 -0700)]
Fix build break by adding missing parenthesis.

Change-Id: Ia9a47e24b25e3093f19aeea297a86964c8f00722

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:10:07 +0000 (23:10 +0000)]
Merge \"Add usage line for dump-profiles\" into nyc-dev
am: a85c1e8e69

Change-Id: I62cf1d3c0ea6295500fbb730dfa75e7046c8c06d

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:41 +0000 (22:57 +0000)]
Minor fixes to distribute cards and fab. am: 5ec3a404fb am: ba9c3d585f am: f5c85abac6
am: f91783c8a5

Change-Id: I1094dd6a0a256ce7dd4942ce02374b4b44786278

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 agoMerge "Adds CDMA Voice Privacy Property to Call" into nyc-mr1-dev
Brad Ebinger [Tue, 7 Jun 2016 22:14:50 +0000 (22:14 +0000)]
Merge "Adds CDMA Voice Privacy Property to Call" into nyc-mr1-dev

8 years agoMerge "Fix flaky discoverable stress test." into nyc-mr1-dev
Sharvil Nanavati [Tue, 7 Jun 2016 22:14:21 +0000 (22:14 +0000)]
Merge "Fix flaky discoverable stress test." into nyc-mr1-dev

8 years agoFix flaky discoverable stress test.
Sharvil Nanavati [Tue, 7 Jun 2016 20:35:59 +0000 (13:35 -0700)]
Fix flaky discoverable stress test.

Bug: 28980767
Change-Id: I6858456f58118a3385b05d42361a5c9223ebbdc4

8 years agodocs: Added CL commands for data-saver testing am: b603eae9b3 am: 2d05938af9
Eric Schmidt [Tue, 7 Jun 2016 21:57:50 +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: I14490c4309d6318436b8430035de8cb27329141e

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 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 "Fix bug while writing data to parcel in TelephonyHistogram.java" into nyc...
Sanket Padawe [Tue, 7 Jun 2016 20:52:58 +0000 (20:52 +0000)]
Merge "Fix bug while writing data to parcel in TelephonyHistogram.java" into nyc-mr1-dev

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

* commit 'a86d6c4df3b193060b4b725e1abfed4f69689843':
  Fix getApplicationRestrictions documentation

Change-Id: Ia552cc886a182f558b7479b1d2a0201061dc5cc6

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 agoMerge "Bug: 28875393 Bug: 28879732" into nyc-mr1-dev
William Harmon [Tue, 7 Jun 2016 16:15:37 +0000 (16:15 +0000)]
Merge "Bug: 28875393 Bug: 28879732" into nyc-mr1-dev

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:30 +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: I56a305f47f468464ae11b48396342d1e7ade239f

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:09 +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: Iec4e17778428bdda04d9ea34010abbdfcfede9c5

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

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

Change-Id: I6a02ffbf03e5dc22b21c54cc24268f4e6b54459c

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

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

Change-Id: Iaf5270f03ef6214b9d3064f19aa0219b422687c5

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 agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 7 Jun 2016 03:12:33 +0000 (03:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-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:37 +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: Ie6bc9da984bc94b51d091bf3a3b4c035ff83aba6

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Tue, 7 Jun 2016 02:27:32 +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: Ic44082939456434a33682a1f5c2cee4a0f4b3d9d

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

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 agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 7 Jun 2016 02:21:05 +0000 (02:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

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

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

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 agoMerge "Revert "Internal API for cross-task Activity used by assistant."" into nyc...
TreeHugger Robot [Mon, 6 Jun 2016 23:44:33 +0000 (23:44 +0000)]
Merge "Revert "Internal API for cross-task Activity used by assistant."" into nyc-mr1-dev

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

Change-Id: Ie4d854df968366efde752e7ebe89afbe5aa8183a
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 agoFix bug while writing data to parcel in TelephonyHistogram.java
Sanket Padawe [Mon, 6 Jun 2016 22:49:42 +0000 (15:49 -0700)]
Fix bug while writing data to parcel in TelephonyHistogram.java

Bug: 29117186
Change-Id: Ic694adc3323062e90c0e6586ea31e7691036ffcd

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

Change-Id: I435f426fc53cd54df412c159c7016eb5cfe934a7
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:17 +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: I12062a187d6aa0bfd0d005b7fe22c190b7a06f56

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 agoRevert "Internal API for cross-task Activity used by assistant."
Eino-Ville Talvala [Mon, 6 Jun 2016 22:04:54 +0000 (22:04 +0000)]
Revert "Internal API for cross-task Activity used by assistant."

This reverts commit 04073dc5be4c8faad41f549617ed1c3ef999d6b2.

Bug: 29128683
Change-Id: I7d9bb7bb388f38e8e5ab159a211ee7f9f4fb7ab9

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