OSDN Git Service
Android Build Merger (Role) [Wed, 8 Jun 2016 13:24:17 +0000 (13:24 +0000)]
Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
c20ea2eb43 -s ours am:
26e9a5c9f8 -s ours" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 8 Jun 2016 13:24:11 +0000 (13:24 +0000)]
Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
e573989e05 -s ours am:
064464251f -s ours" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 8 Jun 2016 13:24:06 +0000 (13:24 +0000)]
Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
64d6fddc4b -s ours am:
25ad61262e -s ours" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 8 Jun 2016 13:24:00 +0000 (13:24 +0000)]
Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
c20ea2eb43 -s ours am:
10b388fe9a -s ours" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 8 Jun 2016 13:23:53 +0000 (13:23 +0000)]
Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
2d3c74a2fd -s ours am:
74323832de -s ours" into nyc-mr1-dev-plus-aosp
Baligh Uddin [Wed, 8 Jun 2016 13:22:52 +0000 (13:22 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
c20ea2eb43 -s ours
am:
26e9a5c9f8 -s ours
Change-Id: I15c4aa8283e84123d4329528b51da7b3373e8a15
Baligh Uddin [Wed, 8 Jun 2016 13:22:45 +0000 (13:22 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
64d6fddc4b -s ours
am:
25ad61262e -s ours
Change-Id: Iee43526b198d33f10bafde6136de850997fb8284
Baligh Uddin [Wed, 8 Jun 2016 13:22:44 +0000 (13:22 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
e573989e05 -s ours
am:
064464251f -s ours
Change-Id: Ie4c5dd34b8ed1f7202fc75ee7fad54d3c8cc1338
Baligh Uddin [Wed, 8 Jun 2016 13:22:38 +0000 (13:22 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
c20ea2eb43 -s ours
am:
10b388fe9a -s ours
Change-Id: Ia31ceb8543fe4b74c9a2ca912ffca21b3739d583
Baligh Uddin [Wed, 8 Jun 2016 13:22:38 +0000 (13:22 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
2d3c74a2fd -s ours
am:
74323832de -s ours
Change-Id: I89891b68d8175b457dd0be65a0a9ea7abe9d9db2
Baligh Uddin [Wed, 8 Jun 2016 13:22:35 +0000 (13:22 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
64d6fddc4b -s ours
am:
fde831f55d -s ours
Change-Id: I6932ff5640e74a3b1b7c608a481ff79f54c82734
Baligh Uddin [Wed, 8 Jun 2016 13:22:31 +0000 (13:22 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
2d3c74a2fd -s ours
am:
a9cd961151 -s ours
Change-Id: Iea9e8849607318059589b75242df9faf95d7a0a8
Baligh Uddin [Wed, 8 Jun 2016 13:11:03 +0000 (13:11 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
e573989e05 -s ours
Change-Id: I8d196f18d64ae8231f6bb41ffdffbe949a0d0cbd
Baligh Uddin [Wed, 8 Jun 2016 13:10:58 +0000 (13:10 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
c20ea2eb43 -s ours
Change-Id: I4a393b6c0902a3923ca776ba4f8515993bcb2672
Baligh Uddin [Wed, 8 Jun 2016 13:10:53 +0000 (13:10 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
64d6fddc4b -s ours
Change-Id: Ibcce9df3461b1a73998c7ab69790767b902f19db
Baligh Uddin [Wed, 8 Jun 2016 13:10:48 +0000 (13:10 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
2d3c74a2fd -s ours
Change-Id: I8cc211f1beea935b8c69e9e77c5188e404d77589
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
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
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
Baligh Uddin [Wed, 8 Jun 2016 13:05:46 +0000 (13:05 +0000)]
Merge "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
Baligh Uddin [Wed, 8 Jun 2016 13:05:38 +0000 (13:05 +0000)]
Merge "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
Robin Lee [Wed, 8 Jun 2016 10:57:22 +0000 (10:57 +0000)]
Merge \\"Package changed/removed listeners for always-on VPN\\" into nyc-dev am:
ee5e4cc836
am:
e4f8805d6a
Change-Id: I69ddb790aac005bd55f11d2a371d992311443a5f
Robin Lee [Wed, 8 Jun 2016 10:54:52 +0000 (10:54 +0000)]
Merge \\"Package changed/removed listeners for always-on VPN\\" into nyc-dev am:
ee5e4cc836
am:
be16e49f0a
Change-Id: I64ab86a9133d524865bed8c7824634e0539c1212
Robin Lee [Wed, 8 Jun 2016 10:50:43 +0000 (10:50 +0000)]
Merge \"Package changed/removed listeners for always-on VPN\" into nyc-dev
am:
ee5e4cc836
Change-Id: Idd2e019feb73bd580aa7d8baba03c27083e26b02
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
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
Lorenzo Colitti [Wed, 8 Jun 2016 06:39:18 +0000 (06:39 +0000)]
Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev
am:
3e2bfbd135
Change-Id: I2305c4019f56896d741caa509df41416368e5642
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.
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
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
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
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
Android Build Merger (Role) [Wed, 8 Jun 2016 02:28:19 +0000 (02:28 +0000)]
Merge "Merge \\"Revert \\"Improve accessibility window title behavior\\"\\" into nyc-dev am:
fc71309640 am:
5c32d65e78" into nyc-mr1-dev-plus-aosp
Phil Weaver [Wed, 8 Jun 2016 02:27:57 +0000 (02:27 +0000)]
Merge \\"Revert \\"Improve accessibility window title behavior\\"\\" into nyc-dev am:
fc71309640
am:
5c32d65e78
Change-Id: If87df534b3c3a796ac6f90392c493a29b0f6d755
Phil Weaver [Wed, 8 Jun 2016 02:27:41 +0000 (02:27 +0000)]
Merge \\"Revert \\"Improve accessibility window title behavior\\"\\" into nyc-dev am:
fc71309640
am:
2c8099110e
Change-Id: Id615a721b788760b54754355414fe9762d65f0ab
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
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
Phil Weaver [Wed, 8 Jun 2016 02:19:33 +0000 (02:19 +0000)]
Merge "Revert "Improve accessibility window title behavior"" into nyc-dev
Android Build Merger (Role) [Wed, 8 Jun 2016 01:32:22 +0000 (01:32 +0000)]
Merge "Merge \\"Check if task was top of stack before it\\'s removed\\" into nyc-dev am:
94b4029f03 am:
cfefb2b85c" into nyc-mr1-dev-plus-aosp
Chong Zhang [Wed, 8 Jun 2016 01:31:57 +0000 (01:31 +0000)]
Merge \\"Check if task was top of stack before it\\'s removed\\" into nyc-dev am:
94b4029f03
am:
cfefb2b85c
Change-Id: I3550515c849ebe48051c33c9e42fc032be0cd49d
Chong Zhang [Wed, 8 Jun 2016 01:31:05 +0000 (01:31 +0000)]
Merge \\"Check if task was top of stack before it\\'s removed\\" into nyc-dev am:
94b4029f03
am:
b6e31cef99
Change-Id: Ifeaa9d372efc5bf11f4346cb4810bf913c61f7cc
Chong Zhang [Wed, 8 Jun 2016 01:31:01 +0000 (01:31 +0000)]
Merge \"Merge \\"Use getActivityToken() instead of mToken in isTopOfTask\\" into nyc-dev am:
723e5afa9e\" into nyc-mr1-dev
am:
22eaf715a1
Change-Id: I657487ecab8b23a002e32072bca17d21e627a804
Android Build Merger (Role) [Wed, 8 Jun 2016 01:27:43 +0000 (01:27 +0000)]
Merge "Merge \\"Use getActivityToken() instead of mToken in isTopOfTask\\" into nyc-dev am:
723e5afa9e am:
1895addcef" into nyc-mr1-dev-plus-aosp
Chong Zhang [Wed, 8 Jun 2016 01:27:16 +0000 (01:27 +0000)]
Merge \\"Use getActivityToken() instead of mToken in isTopOfTask\\" into nyc-dev am:
723e5afa9e
am:
1895addcef
Change-Id: Ifb8ca430fbb754a73e6b891c5a97e0cf201cf7f4
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
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
Felipe Leme [Wed, 8 Jun 2016 01:25:34 +0000 (01:25 +0000)]
Merge \"Added a getPrimaryStorageSize() method.\" into nyc-mr1-dev
am:
ba3676460a
Change-Id: Ibabc9b60735422360fe770eb7ba57c70532f22c4
Felipe Leme [Wed, 8 Jun 2016 01:25:30 +0000 (01:25 +0000)]
Merge \\"Duplicate file descriptor when dumping asynchronously.\\" into nyc-dev am:
c02ba17898
am:
53c1637134
Change-Id: Ic53a1fd625879f75b8ff541c0a91336fcaea288b
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
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
TreeHugger Robot [Wed, 8 Jun 2016 01:22:17 +0000 (01:22 +0000)]
Merge "Added a getPrimaryStorageSize() method." into nyc-mr1-dev
Felipe Leme [Wed, 8 Jun 2016 01:21:57 +0000 (01:21 +0000)]
Merge \\"Duplicate file descriptor when dumping asynchronously.\\" into nyc-dev am:
c02ba17898
am:
9d178342d8
Change-Id: I9afdc281e2fe68c74ef7a676dd4f437013fe909a
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
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
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
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
Chong Zhang [Wed, 8 Jun 2016 01:12:25 +0000 (01:12 +0000)]
Merge "Use getActivityToken() instead of mToken in isTopOfTask" into nyc-dev
Android Build Merger (Role) [Wed, 8 Jun 2016 01:08:41 +0000 (01:08 +0000)]
Merge "Merge \\"Set fontScale in override config to be equal to global.\\" into nyc-dev am:
c9adac6abb am:
c4d9ea8551" into nyc-mr1-dev-plus-aosp
TreeHugger Robot [Wed, 8 Jun 2016 01:08:40 +0000 (01:08 +0000)]
Merge "Duplicate file descriptor when dumping asynchronously." into nyc-dev
Chong Zhang [Wed, 8 Jun 2016 01:08:14 +0000 (01:08 +0000)]
Merge \\"Set fontScale in override config to be equal to global.\\" into nyc-dev am:
c9adac6abb
am:
c4d9ea8551
Change-Id: I7e59243cd1535fd4c6f55de0f13021036d838918
Chong Zhang [Wed, 8 Jun 2016 01:08:09 +0000 (01:08 +0000)]
Merge \\"Set fontScale in override config to be equal to global.\\" into nyc-dev am:
c9adac6abb
am:
01a3095f5f
Change-Id: I99b830777ca94e095c2d6796681d7aec08ad4d41
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
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
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
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
Siyamed Sinir [Wed, 8 Jun 2016 00:59:44 +0000 (00:59 +0000)]
Merge \\"Fix int overflow in SpannableStringBuilder.replace\\" into nyc-dev am:
96c3e5504b
am:
df3d144b17
Change-Id: I50d759b3865fe66e23f5bc82199c9b512a3489c1
Siyamed Sinir [Wed, 8 Jun 2016 00:56:45 +0000 (00:56 +0000)]
Merge \\"Fix int overflow in SpannableStringBuilder.replace\\" into nyc-dev am:
96c3e5504b
am:
9eddf7ae8e
Change-Id: I2901fa9b6debdac559637732cc5e4eaf4eed8467
Android Build Merger (Role) [Wed, 8 Jun 2016 00:50:46 +0000 (00:50 +0000)]
Merge "Merge \\"Frameworks/base: Fix FastPrintWriter infinite loop\\" into nyc-dev am:
c82a2b5358 am:
66c2bfcede" into nyc-mr1-dev-plus-aosp
Andreas Gampe [Wed, 8 Jun 2016 00:50:17 +0000 (00:50 +0000)]
Merge \\"Frameworks/base: Fix FastPrintWriter infinite loop\\" into nyc-dev am:
c82a2b5358
am:
66c2bfcede
Change-Id: I3c4525f3931443aa6a2e16816924850e41c952b7
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
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
Andreas Gampe [Wed, 8 Jun 2016 00:50:03 +0000 (00:50 +0000)]
Merge \\"Frameworks/base: Fix FastPrintWriter infinite loop\\" into nyc-dev am:
c82a2b5358
am:
89b7934905
Change-Id: Idaa84ae75512929656f63318db819232f42d91f7
Siyamed Sinir [Wed, 8 Jun 2016 00:46:27 +0000 (00:46 +0000)]
Merge "Fix int overflow in SpannableStringBuilder.replace" into nyc-dev
Android Build Merger (Role) [Wed, 8 Jun 2016 00:46:12 +0000 (00:46 +0000)]
Merge "Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am:
4401e24add am:
2cf5b73c0a" into nyc-mr1-dev-plus-aosp
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
Jim Miller [Wed, 8 Jun 2016 00:45:35 +0000 (00:45 +0000)]
Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am:
4401e24add
am:
2cf5b73c0a
Change-Id: Ie2c8adbeefaab6f9fa1ff6802d938e31be065b84
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
Jim Miller [Wed, 8 Jun 2016 00:43:48 +0000 (00:43 +0000)]
Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am:
4401e24add
am:
21c77ed1a8
Change-Id: I7c561e027b7216686b8d096ac97e6c6c5a633eaf
TreeHugger Robot [Wed, 8 Jun 2016 00:38:59 +0000 (00:38 +0000)]
Merge "Frameworks/base: Fix FastPrintWriter infinite loop" 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
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
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
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
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
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
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
Sharvil Nanavati [Tue, 7 Jun 2016 23:47:39 +0000 (23:47 +0000)]
Merge \"Fix build break by adding missing parenthesis.\" into nyc-mr1-dev
am:
f4f7c64c75
Change-Id: Ie10bd4ea8d7345550fb4a42090320d31669321fa
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
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 **
Sharvil Nanavati [Tue, 7 Jun 2016 23:41:16 +0000 (16:41 -0700)]
Fix build break by adding missing parenthesis.
Change-Id: Ia9a47e24b25e3093f19aeea297a86964c8f00722
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
David Sehr [Tue, 7 Jun 2016 23:16:40 +0000 (23:16 +0000)]
Merge \\"Add usage line for dump-profiles\\" into nyc-dev am:
a85c1e8e69
am:
eff498946f
Change-Id: I763463605dd5ed84aec0f3c6502f944fefe24388
David Sehr [Tue, 7 Jun 2016 23:13:11 +0000 (23:13 +0000)]
Merge \\"Add usage line for dump-profiles\\" into nyc-dev am:
a85c1e8e69
am:
514c1ae4c6
Change-Id: I798f8c789c8735462c556c6c1c469a1abe1f6f4a
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
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
Dirk Dougherty [Tue, 7 Jun 2016 23:04:33 +0000 (23:04 +0000)]
Minor fixes to distribute cards and fab. am:
5ec3a404fb am:
ba9c3d585f am:
f5c85abac6 am:
f91783c8a5
am:
ba446488aa
Change-Id: Ieff4647f43be330106f0d0af61c8c285c3804508
Dirk Dougherty [Tue, 7 Jun 2016 23:02:51 +0000 (23:02 +0000)]
Minor fixes to distribute cards and fab. am:
5ec3a404fb am:
ba9c3d585f am:
f5c85abac6 am:
f91783c8a5
am:
db4948a1d3
Change-Id: I4c707846a9dd911f96e57bb0ba91deb7a7d3c94d
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
OSDN Git Service
