246654 Commits

Author SHA1 Message Date
Baligh Uddin
e573989e05 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-08 13:05:47 +00:00
Baligh Uddin
c20ea2eb43 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-08 13:05:43 +00:00
Baligh Uddin
64d6fddc4b Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-08 13:05:40 +00:00
Baligh Uddin
2d3c74a2fd Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-08 13:05:37 +00:00
Jason Monk
9ffd9f61d3 QS: Fix leak in QSAnimator
Change-Id: I54f1e083cf6ba6bfb5abc0f416680cbda1401980
Fixes: 29113833
2016-06-08 09:05:08 -04:00
Robin Lee
be16e49f0a Merge \"Package changed/removed listeners for always-on VPN\" into nyc-dev
am: ee5e4cc836

Change-Id: I8f7054b5a2ac69677a0e124e9a616b3d58b604af
2016-06-08 10:50:42 +00:00
TreeHugger Robot
ee5e4cc836 Merge "Package changed/removed listeners for always-on VPN" into nyc-dev 2016-06-08 10:46:42 +00:00
TreeHugger Robot
3e2bfbd135 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.
2016-06-08 06:35:32 +00:00
Lorenzo Colitti
eab17da588 Give WakeupMessage the ability to transport an object as well.
Bug: 23113288
Change-Id: Ic98e3bcb3ea8b0b28a309bd647fb4178311c46a3
2016-06-08 14:11:52 +09:00
Lorenzo Colitti
9acda9c825 Don't treat the lingerExpired broadcast specially.
NetworkMonitor no longer uses the broadcast for lingering, it
uses WakeupMessage instead.

Bug: 23113288
Change-Id: Idb0c55fc68cb8f45b3213c7134213904f227852e
2016-06-08 14:09:07 +09:00
Lorenzo Colitti
762ea7aab7 Add a test for mobile data always on.
Bug: 23113288
Change-Id: Ia8649061a797367d135bb5576600a7cdc85a822e
2016-06-08 14:08:59 +09:00
Lorenzo Colitti
6d553f6dfd 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
2016-06-08 14:05:55 +09:00
Baligh Uddin
460b95639e Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 29169863
Change-Id: Ic7b964650e55d381c9b2f7a18f1358a5cc033d21
2016-06-07 20:49:52 -07:00
Phil Weaver
5c32d65e78 Merge \"Revert \"Improve accessibility window title behavior\"\" into nyc-dev
am: fc71309640

Change-Id: I7b0c0636a69e4cc06d525f60d8621879ce45be22
2016-06-08 02:24:42 +00:00
Phil Weaver
fc71309640 Merge "Revert "Improve accessibility window title behavior"" into nyc-dev 2016-06-08 02:19:34 +00:00
Chong Zhang
b6e31cef99 Merge \"Check if task was top of stack before it\'s removed\" into nyc-dev
am: 94b4029f03

Change-Id: I58b62cd4b61952e82b2e2e6951b0f3a40511a340
2016-06-08 01:26:27 +00:00
Android Build Merger (Role)
22eaf715a1 Merge "Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev am: 723e5afa9e" into nyc-mr1-dev 2016-06-08 01:23:04 +00:00
Chong Zhang
5c689127ba Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev
am: 723e5afa9e

Change-Id: Ib739a55588b270e76cdb11c5356fd90c19c644dc
2016-06-08 01:22:43 +00:00
TreeHugger Robot
ba3676460a Merge "Added a getPrimaryStorageSize() method." into nyc-mr1-dev 2016-06-08 01:22:18 +00:00
Chong Zhang
94b4029f03 Merge "Check if task was top of stack before it's removed" into nyc-dev 2016-06-08 01:18:01 +00:00
Felipe Leme
53c1637134 Merge \"Duplicate file descriptor when dumping asynchronously.\" into nyc-dev
am: c02ba17898

Change-Id: Ief488d02aac6900453e5344959aad8c417d60c8d
2016-06-08 01:15:06 +00:00
Chong Zhang
723e5afa9e Merge "Use getActivityToken() instead of mToken in isTopOfTask" into nyc-dev 2016-06-08 01:12:27 +00:00
TreeHugger Robot
c02ba17898 Merge "Duplicate file descriptor when dumping asynchronously." into nyc-dev 2016-06-08 01:08:42 +00:00
Chong Zhang
c4d9ea8551 Merge \"Set fontScale in override config to be equal to global.\" into nyc-dev
am: c9adac6abb

Change-Id: If62da650207267872815af6f7e793b193e23d10e
2016-06-08 01:04:12 +00:00
Baligh Uddin
1696f811f4 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 29169863
Change-Id: Ieac4df1080a37509c12c420f15e64063e9c15fc4
2016-06-07 18:03:04 -07:00
Chong Zhang
c9adac6abb Merge "Set fontScale in override config to be equal to global." into nyc-dev 2016-06-08 00:59:44 +00:00
Tianjie Xu
a2fe5517bc 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
2016-06-07 17:54:48 -07:00
Siyamed Sinir
9eddf7ae8e Merge \"Fix int overflow in SpannableStringBuilder.replace\" into nyc-dev
am: 96c3e5504b

Change-Id: Ibac22676dcfcd8874bc2415f7fb4f76849896748
2016-06-08 00:50:14 +00:00
Siyamed Sinir
96c3e5504b Merge "Fix int overflow in SpannableStringBuilder.replace" into nyc-dev 2016-06-08 00:46:28 +00:00
Andreas Gampe
89b7934905 Merge \"Frameworks/base: Fix FastPrintWriter infinite loop\" into nyc-dev
am: c82a2b5358

Change-Id: I9ff1746643acbbf8663b6e1c5fce553e4f803df4
2016-06-08 00:45:34 +00:00
TreeHugger Robot
c82a2b5358 Merge "Frameworks/base: Fix FastPrintWriter infinite loop" into nyc-dev 2016-06-08 00:39:00 +00:00
Jim Miller
21c77ed1a8 Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
am: 4401e24add

Change-Id: Ibe8709900618cc5d9c5ca18a88ca6fce8c552d54
2016-06-08 00:38:25 +00:00
Phil Weaver
266ed9acc3 Revert "Improve accessibility window title behavior"
Bug: 29127065

This reverts commit 2a7e4442bf9892842e0fc7eba9296e8fcf9f8ea5.

Change-Id: Ibc5527cfedd49c685ffd1b8ae59e87ed99c93d39
2016-06-08 00:34:40 +00:00
Baligh Uddin
2d40d2c619 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 29169863
Change-Id: I3d2586f7265f533c4b1620349c1a52851b4586e0
2016-06-07 17:32:37 -07:00
TreeHugger Robot
4401e24add Merge "Move legacy full disk encryption code to Settings." into nyc-dev 2016-06-08 00:31:31 +00:00
Baligh Uddin
471718a57f Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 29169863
Change-Id: Icab456e7a193fc6099bbd6e7ff207d542e98830e
2016-06-07 17:16:36 -07:00
Baligh Uddin
a2e9249983 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 29169863
Change-Id: I717395f19e8605b4ad4af00b8601ff59c3acb73c
2016-06-07 17:02:34 -07:00
Julia Reynolds
9eb2c1e85c Handle alarm firing outside of DND period.
Change-Id: Ib8bb878709ab8b5db8aba7f31e239e44409e18d4
Fixes: 28459870
2016-06-07 19:58:38 -04:00
Sharvil Nanavati
f4f7c64c75 Merge "Fix build break by adding missing parenthesis." into nyc-mr1-dev 2016-06-07 23:43:45 +00:00
Felipe Leme
18202e00bd Added a getPrimaryStorageSize() method.
BUG: 24128505

Change-Id: I0b75d3c5505dadedf5d06868614b3a01765cc5d3

** Cherrypicked from master **
2016-06-07 16:42:35 -07:00
Sharvil Nanavati
957abc8318 Fix build break by adding missing parenthesis.
Change-Id: Ia9a47e24b25e3093f19aeea297a86964c8f00722
2016-06-07 16:41:16 -07:00
Felipe Leme
29de4922db 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
2016-06-07 16:35:50 -07:00
Makoto Onuki
157b1628fd ShortcutManager: deal with changing resource IDs on app update
- When an app is upgraded, all the resource IDs may change.  So
if a shortcut is previously published with an icon for res ID 100
and the publisher is upgraded, resource #100 may refer to something
different.

- So now the service also remembers resource names for icon resources,
as wells as string resources.  When an app is updated, the service
fetch the updated resource IDs by name.

- Also extract all string resources when a shortcut is published
and persist them, so that even when the original string resources are
removed from the app, the launcher can still show the extracted strings.

- When the system locale changes, re-extract all string resources.

- Also really hide the constants in ShortcutInfo that were
accidentally made public.

Change-Id: I23c29b45c1de5d76175229190a1533c9c62c5960
2016-06-07 16:11:30 -07:00
David Sehr
eff498946f Merge \"Add usage line for dump-profiles\" into nyc-dev
am: a85c1e8e69

Change-Id: I62cf1d3c0ea6295500fbb730dfa75e7046c8c06d
2016-06-07 23:10:07 +00:00
Andreas Gampe
ce78b9e114 Frameworks/base: Fix FastPrintWriter infinite loop
Check for error condition in loop.

Bug: 29123428
Change-Id: I361ed27ecb8f05512d7e17f8045f3d34667d32d8
2016-06-07 16:02:23 -07:00
David Sehr
a85c1e8e69 Merge "Add usage line for dump-profiles" into nyc-dev 2016-06-07 23:01:10 +00:00
Dirk Dougherty
db4948a1d3 Minor fixes to distribute cards and fab. am: 5ec3a404fb am: ba9c3d585f am: f5c85abac6
am: f91783c8a5

Change-Id: I1094dd6a0a256ce7dd4942ce02374b4b44786278
2016-06-07 22:57:41 +00:00
Chong Zhang
92ab103cb6 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
2016-06-07 15:56:53 -07:00
Dirk Dougherty
f91783c8a5 Minor fixes to distribute cards and fab. am: 5ec3a404fb am: ba9c3d585f
am: f5c85abac6

Change-Id: I2ea6f9370725235b9d63f6c5a843e42b09361315
2016-06-07 22:53:20 +00:00
Dirk Dougherty
f5c85abac6 Minor fixes to distribute cards and fab. am: 5ec3a404fb
am: ba9c3d585f

Change-Id: I6f250c2b9733562e388e2cd81ab9b7c365bb3c9a
2016-06-07 22:48:17 +00:00