OSDN Git Service
Jerry Zhang [Thu, 19 Oct 2017 18:22:46 +0000 (18:22 +0000)]
Merge "Add storageId to moveObjects" am:
1f4f6d2a18
am:
18abf57e99
Change-Id: Ieb79d5a10307c47cd772ae5ef621717d5c90cdc2
Jerry Zhang [Thu, 19 Oct 2017 18:11:49 +0000 (18:11 +0000)]
Merge "Add storageId to moveObjects"
am:
1f4f6d2a18
Change-Id: Id4f53fc283850d8f93cde7e67581355dc50e595e
Jerry Zhang [Thu, 19 Oct 2017 17:55:34 +0000 (17:55 +0000)]
Merge "Add storageId to moveObjects"
Benedict Wong [Thu, 19 Oct 2017 17:26:19 +0000 (17:26 +0000)]
Merge "Add support for AES-GCM-ESP as an IPSec algorithm" am:
b6df7f0d35
am:
d3a5792024
Change-Id: I5bf43f78716769a6f1f90169f500e9eee7a91f18
Benedict Wong [Thu, 19 Oct 2017 17:14:53 +0000 (17:14 +0000)]
Merge "Add support for AES-GCM-ESP as an IPSec algorithm"
am:
b6df7f0d35
Change-Id: Ic099206a28c4f21fa796969c953a8d4e81e8495b
Benedict Wong [Thu, 19 Oct 2017 17:06:30 +0000 (17:06 +0000)]
Merge "Add support for AES-GCM-ESP as an IPSec algorithm"
Tobias Thierer [Thu, 19 Oct 2017 16:31:25 +0000 (16:31 +0000)]
Merge "Move most android.util.Mutable* classes to framework." am:
cd06caf10e
am:
4719440f3f
Change-Id: I699ae1fdec65f8c0ed584c13424e922f226d3ce0
Tobias Thierer [Thu, 19 Oct 2017 16:18:44 +0000 (16:18 +0000)]
Merge "Move most android.util.Mutable* classes to framework."
am:
cd06caf10e
Change-Id: I25fd01bd4bc8c582e6cb79a03de47847b46bcb83
Tobias Thierer [Thu, 19 Oct 2017 16:08:07 +0000 (16:08 +0000)]
Merge "Move most android.util.Mutable* classes to framework."
Tobias Thierer [Thu, 19 Oct 2017 14:34:36 +0000 (14:34 +0000)]
Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os" am:
5f04db96b3
am:
07efe116b1
Change-Id: I1c9f25ea1ac00037cc90dfe4c8c2552f90a33ecd
Tobias Thierer [Thu, 19 Oct 2017 14:25:12 +0000 (14:25 +0000)]
Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os"
am:
5f04db96b3
Change-Id: If85216d03022708787a7218e494434453d5548e3
Tobias Thierer [Thu, 19 Oct 2017 14:15:52 +0000 (14:15 +0000)]
Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os"
Manu Viswanadhan [Thu, 19 Oct 2017 06:12:20 +0000 (06:12 +0000)]
Merge "Settings: Fix leak of BroadcastReceiver intents" am:
3499af28c4
am:
1b4a0abdbb
Change-Id: I4779532a0be4e8a821e521d1b962b4c57ecf86b8
Manu Viswanadhan [Thu, 19 Oct 2017 06:02:23 +0000 (06:02 +0000)]
Merge "Settings: Fix leak of BroadcastReceiver intents"
am:
3499af28c4
Change-Id: I2b0f3920f39981956d25017999a25799d995252b
Treehugger Robot [Thu, 19 Oct 2017 05:53:23 +0000 (05:53 +0000)]
Merge "Settings: Fix leak of BroadcastReceiver intents"
Beverly Tai [Thu, 19 Oct 2017 03:58:38 +0000 (03:58 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714 am:
9b0a6a3509 -s ours am:
f1a95220a3 am:
c6ca9254ed am:
7fd4bec14a am:
b00fd6bb97 am:
93d9ac257d -s ours am:
1ce0456b99
am:
a9d3b4d806
Change-Id: I325ff1074f1481ffdb661a8bee155b64e7586f1b
Siyamed Sinir [Thu, 19 Oct 2017 03:43:28 +0000 (03:43 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006 am:
2bab19f9aa am:
69cc90b01c am:
19a3c53841 am:
9950579eb5 am:
8621a28b04 am:
685b515140 am:
65f1a4c4c2
am:
b614e5560e
Change-Id: I34c80d0a98a7a4ea1c78f5ae8619e9566bb33476
Beverly Tai [Thu, 19 Oct 2017 03:34:46 +0000 (03:34 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714 am:
9b0a6a3509 -s ours am:
f1a95220a3 am:
c6ca9254ed am:
7fd4bec14a am:
b00fd6bb97 am:
93d9ac257d -s ours
am:
1ce0456b99
Change-Id: I9650a76a4f2dacb2c37e8232409e03c8745383f7
Siyamed Sinir [Thu, 19 Oct 2017 03:22:50 +0000 (03:22 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006 am:
2bab19f9aa am:
69cc90b01c am:
19a3c53841 am:
9950579eb5 am:
8621a28b04 am:
685b515140
am:
65f1a4c4c2
Change-Id: I97965f18ce2146b65542ef8c2125c88c024c67c8
Beverly Tai [Thu, 19 Oct 2017 03:06:40 +0000 (03:06 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714 am:
9b0a6a3509 -s ours am:
f1a95220a3 am:
c6ca9254ed am:
7fd4bec14a am:
b00fd6bb97
am:
93d9ac257d -s ours
Change-Id: Ic1a98303821102d3cddbdbf52b98f2739c2507f6
Siyamed Sinir [Thu, 19 Oct 2017 03:00:17 +0000 (03:00 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006 am:
2bab19f9aa am:
69cc90b01c am:
19a3c53841 am:
9950579eb5 am:
8621a28b04
am:
685b515140
Change-Id: I42139be71b55e6a9a7c88b97cd99936216541cc3
Beverly Tai [Thu, 19 Oct 2017 02:59:41 +0000 (02:59 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714 am:
9b0a6a3509 -s ours am:
f1a95220a3 am:
c6ca9254ed am:
7fd4bec14a
am:
b00fd6bb97
Change-Id: Ie1ed5edaabe4cf6206764c0f343a70eb588009c5
Siyamed Sinir [Thu, 19 Oct 2017 02:49:27 +0000 (02:49 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006 am:
2bab19f9aa am:
69cc90b01c am:
19a3c53841 am:
9950579eb5
am:
8621a28b04
Change-Id: Ifac3ab83e23f93d8f0834029b44ec8f32bbab243
Beverly Tai [Thu, 19 Oct 2017 02:48:23 +0000 (02:48 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714 am:
9b0a6a3509 -s ours am:
f1a95220a3 am:
c6ca9254ed
am:
7fd4bec14a
Change-Id: Iadf94c4dcda9ae3e7a068838de87a4fadc18be7f
Siyamed Sinir [Thu, 19 Oct 2017 02:37:50 +0000 (02:37 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006 am:
2bab19f9aa am:
69cc90b01c am:
19a3c53841
am:
9950579eb5
Change-Id: I9019cab591a3729592ddd142867f6b3f0c40c369
Beverly Tai [Thu, 19 Oct 2017 02:37:19 +0000 (02:37 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714 am:
9b0a6a3509 -s ours am:
f1a95220a3
am:
c6ca9254ed
Change-Id: I8715d787f890827442c098b7ef5c93c563e4246e
Siyamed Sinir [Thu, 19 Oct 2017 02:26:01 +0000 (02:26 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006 am:
2bab19f9aa am:
69cc90b01c
am:
19a3c53841
Change-Id: I20e8fba8fe69c10c5cbdd1a1d3db27a20a206e51
Beverly Tai [Thu, 19 Oct 2017 02:25:35 +0000 (02:25 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714 am:
9b0a6a3509 -s ours
am:
f1a95220a3
Change-Id: Icccff07eedee53fdc20c40d62e41b40af0b4992f
Suprabh Shukla [Thu, 19 Oct 2017 02:16:32 +0000 (02:16 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da am:
f0d00e51ba am:
4e61bdb7d3 am:
d1e7db9f4a am:
9ecbe6f6e7 am:
a9e9e83964 am:
f580b0f6a4
am:
2bded32359
Change-Id: I630b1db9d19f34f6f42601a36a5883e824087287
Siyamed Sinir [Thu, 19 Oct 2017 02:12:01 +0000 (02:12 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006 am:
2bab19f9aa
am:
69cc90b01c
Change-Id: Ia0630be45dfa4778b204585002c299c847d32366
Beverly Tai [Thu, 19 Oct 2017 02:09:14 +0000 (02:09 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714
am:
9b0a6a3509 -s ours
Change-Id: I8a0b0468b053f31a5e28b335cfdd68d7adf7e4b5
Beverly Tai [Thu, 19 Oct 2017 02:03:19 +0000 (02:03 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d
am:
d34366e714
Change-Id: I1574e30ff64f6c7a691e8f4e1e4110cb0af9ee81
Suprabh Shukla [Thu, 19 Oct 2017 01:59:51 +0000 (01:59 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da am:
f0d00e51ba am:
4e61bdb7d3 am:
d1e7db9f4a am:
9ecbe6f6e7 am:
a9e9e83964
am:
f580b0f6a4
Change-Id: Ie647ac50b0d312df13a163005c2a7bbfd8a4a26e
Siyamed Sinir [Thu, 19 Oct 2017 01:58:22 +0000 (01:58 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006
am:
2bab19f9aa
Change-Id: I3ee3147762e5ad8d72f4478d87800a35639228e0
Siyamed Sinir [Thu, 19 Oct 2017 01:49:20 +0000 (01:49 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0
am:
c26e04b006
Change-Id: Iade150e6e33a8ac095941e55c5871215bf54fe2d
Beverly Tai [Thu, 19 Oct 2017 01:48:33 +0000 (01:48 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966
am:
3d600ede6d
Change-Id: Ibc39fe483882017cbd47733259bd04eb30b187f3
Suprabh Shukla [Thu, 19 Oct 2017 01:44:47 +0000 (01:44 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da am:
f0d00e51ba am:
4e61bdb7d3 am:
d1e7db9f4a am:
9ecbe6f6e7
am:
a9e9e83964
Change-Id: I97ab1af2f24b3773cb879f13d00fb1df0177f3fc
Siyamed Sinir [Thu, 19 Oct 2017 01:39:57 +0000 (01:39 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe
am:
b24023a7e0
Change-Id: If0f97db33c9f48c13c5f97c313807e8aab25a16b
Beverly Tai [Thu, 19 Oct 2017 01:38:56 +0000 (01:38 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours
am:
01ae445966
Change-Id: Ia2dff6ee69c4c7f10413aa98ba17ca717cb492d2
Suprabh Shukla [Thu, 19 Oct 2017 01:30:27 +0000 (01:30 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da am:
f0d00e51ba am:
4e61bdb7d3 am:
d1e7db9f4a
am:
9ecbe6f6e7
Change-Id: I6c55e7667d23c638f16bd4bd5c62f9f706542154
Siyamed Sinir [Thu, 19 Oct 2017 01:30:16 +0000 (01:30 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours
am:
dcdb0e6bbe
Change-Id: I245194dbfd5da9eb5f5d13977b12b5dde39c1bb2
Beverly Tai [Thu, 19 Oct 2017 01:23:57 +0000 (01:23 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours
am:
3ca0cc0ae6 -s ours
Change-Id: Id5662a7d789e3e17e365d99b439cc8e8ab5d1c37
Siyamed Sinir [Thu, 19 Oct 2017 01:20:25 +0000 (01:20 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0
am:
4973227cbf -s ours
Change-Id: I9f53bf5a896885860e204764a8a282f77eff50cd
Suprabh Shukla [Thu, 19 Oct 2017 01:18:27 +0000 (01:18 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da am:
f0d00e51ba am:
4e61bdb7d3
am:
d1e7db9f4a
Change-Id: Ia7824e38f4b5d92d09577e30a20a72bdf513534f
Suprabh Shukla [Thu, 19 Oct 2017 01:07:40 +0000 (01:07 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da am:
f0d00e51ba
am:
4e61bdb7d3
Change-Id: I6baddf0fcdcdd5a1236f69f5b19c67aa1e35b3c2
Suprabh Shukla [Thu, 19 Oct 2017 00:57:00 +0000 (00:57 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da
am:
f0d00e51ba
Change-Id: I4e775fd5b0c2ad74e92ef84ac1b1e2f307d6b54e
Suprabh Shukla [Thu, 19 Oct 2017 00:47:30 +0000 (00:47 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c
am:
cf16ef09da
Change-Id: I82ed951a2f528dab65b95332db48a865b3fe9296
Suprabh Shukla [Thu, 19 Oct 2017 00:37:28 +0000 (00:37 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958
am:
57bbf9bb9c
Change-Id: Ia3f528efeaca69830c1a858e6c4637690c70062a
Suprabh Shukla [Thu, 19 Oct 2017 00:28:13 +0000 (00:28 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2
am:
2d194e5958
Change-Id: I669966eb694623fe3052db84dd1dc6375e1bfde9
Suprabh Shukla [Thu, 19 Oct 2017 00:18:17 +0000 (00:18 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours
am:
d2455f8fa2
Change-Id: I20c7da32465a525b0a0bcd21f862a0a49cf727cb
Suprabh Shukla [Thu, 19 Oct 2017 00:07:54 +0000 (00:07 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448
am:
0597a93629 -s ours
Change-Id: I08d261935eb00ae8e8a929ff9ab54f6ec48fac88
Manu Viswanadhan [Tue, 25 Oct 2016 15:08:23 +0000 (20:38 +0530)]
Settings: Fix leak of BroadcastReceiver intents
Use Case: Repeated BT ON/OFF
Failure: Broadcast receiver leak is observed with ON/OFF stress
test which leads to broadcast receiver delays.
Steps:
BT ON/OFF.
Root Cause: During every ON/OFF there are broadcast receiver leaks
caused by repeated registering of profile intent receivers.
Fix: Separate broadcast receiver created for profile intents, such
that broadcast receiver for adapter state intents is always
active. Unregister and re-register the profile receiver when BT
is turned OFF.
Test: BT ON/OFF
Bug:
35415158
Change-Id: Id1db747c61bb2dd33515ac45cdc2059844d3e4f5
Suprabh Shukla [Wed, 18 Oct 2017 21:28:46 +0000 (21:28 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours am:
9913314caf -s ours am:
28a1dd26e8 -s ours am:
976b873b98 -s ours am:
174d0688cc -s ours
am:
93f47a8662 -s ours
Change-Id: Icfdde90e4e98169ce4dbbc145b9422cd5a1787dc
Suprabh Shukla [Wed, 18 Oct 2017 21:06:57 +0000 (21:06 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours am:
9913314caf -s ours am:
28a1dd26e8 -s ours am:
976b873b98 -s ours
am:
174d0688cc -s ours
Change-Id: Ia0a5c8824afc1bb32179a8770386a84ba60a9034
Suprabh Shukla [Wed, 18 Oct 2017 20:34:12 +0000 (20:34 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours am:
9913314caf -s ours am:
28a1dd26e8 -s ours
am:
976b873b98 -s ours
Change-Id: Idc5e6178ac016e8047e34b98249eefb63dcf830c
Suprabh Shukla [Wed, 18 Oct 2017 20:19:08 +0000 (20:19 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours am:
9913314caf -s ours
am:
28a1dd26e8 -s ours
Change-Id: If444060396d2b80c4073ac2c9fd2c4dcb1129590
Suprabh Shukla [Wed, 18 Oct 2017 20:05:12 +0000 (20:05 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours
am:
9913314caf -s ours
Change-Id: I5acc3db78fd84503b35aaa61539b1c6922e64465
Suprabh Shukla [Wed, 18 Oct 2017 19:43:57 +0000 (19:43 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours
am:
f0f1b1fe9e -s ours
Change-Id: I8ecb93fa4fa973ea6ee4694e1cd458b353a44bac
Suprabh Shukla [Wed, 18 Oct 2017 19:17:53 +0000 (19:17 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours
am:
17f0e4bc00 -s ours
Change-Id: I6dafcb8d51f40d157c2d6efbb41012d19c7eb1d2
Suprabh Shukla [Wed, 18 Oct 2017 19:05:08 +0000 (19:05 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours
am:
62dbcc9af0 -s ours
Change-Id: Ica4728bb090b2653d47308848ef8f771154879ca
Suprabh Shukla [Wed, 18 Oct 2017 18:51:00 +0000 (18:51 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours
am:
88f4c765a6 -s ours
Change-Id: Ia620503c958f9b1b2f44f2e99ba47d36bb558e0f
Tom Cherry [Wed, 18 Oct 2017 18:48:55 +0000 (18:48 +0000)]
Merge "Allow ro. properties to have arbitrary lengths" am:
3851f132d1
am:
9fba6c2fe1
Change-Id: I17743afca87569e5ef6e17572aec0e8e8e535847
Tom Cherry [Wed, 18 Oct 2017 18:39:42 +0000 (18:39 +0000)]
Merge "Allow ro. properties to have arbitrary lengths"
am:
3851f132d1
Change-Id: Ie9c340401786d97e469e283418cffef6fbbbb186
Suprabh Shukla [Wed, 18 Oct 2017 18:36:52 +0000 (18:36 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours
am:
54cbf03ecb -s ours
Change-Id: I500740d20bb4ee1b9cdb2de29387377e02be5872
Benedict Wong [Wed, 23 Aug 2017 04:42:33 +0000 (21:42 -0700)]
Add support for AES-GCM-ESP as an IPSec algorithm
Allows native AES-GCM-ESP to be used as an IPSec transport/tunnel mode
algorithm with kernel support
Bug:
63589918
Test: IPsecService tests added, existing ones pass
Change-Id: Ie1a9a902be205f269aa37bf956198f2e5b177c21
Tom Cherry [Wed, 18 Oct 2017 18:21:10 +0000 (18:21 +0000)]
Merge "Allow ro. properties to have arbitrary lengths"
Suprabh Shukla [Wed, 18 Oct 2017 18:19:39 +0000 (18:19 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours
am:
5bd2c48ac0 -s ours
Change-Id: Ib09d2326565a43d3ff0c4d0a88041703658a8804
Suprabh Shukla [Wed, 18 Oct 2017 18:04:15 +0000 (18:04 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f
am:
53a2e46036 -s ours
Change-Id: Ic0fa17750a252a75912c4a2da73d45ff9a9fea1d
Tom Cherry [Wed, 18 Oct 2017 16:25:17 +0000 (09:25 -0700)]
Allow ro. properties to have arbitrary lengths
Bug:
23102347
Bug:
34954705
Test: build
Change-Id: I99b074633c60e95cdd2284bf8a708b9187c1e310
Tobias Thierer [Wed, 18 Oct 2017 13:33:57 +0000 (14:33 +0100)]
Move most android.util.Mutable* classes to framework.
android.util is the only package shared between libcore and
framework, with only the Mutable* classes living in libcore.
This CL topic moves most of these classes to framework.
After this CL topic, only MutableInt and MutableLong remain
in libcore. This prevents future libcore dependencies on
android.util; it is a first step towards removing the package
overlap between libcore and framework.
Test: Treehugger
Bug:
67901714
Change-Id: Id466181cb0db747da17f38ddb0b99c3e522add16
Tobias Thierer [Tue, 17 Oct 2017 19:26:20 +0000 (20:26 +0100)]
Framework: Prefer android.system.Os over libcore.io.Libcore.os
This is a pure refactoring with no a behavior change other than
that these calls now go through android.system.Os, which immediately
delegates to Libcore.os.
This is a first step towards separating framework (via
android.system.Os) vs. libcore (via Libcore.os) clients of these
low level APIs. Separating these is a prerequisite towards moving
the API parts of android.system into framework, and moving the
rest into a different package in libcore.
Test: Treehugger
Bug:
67901714
Change-Id: Ifd8349ec5416e5693f40dba48fdf2bef651b7d81
Merged-In: Ifd8349ec5416e5693f40dba48fdf2bef651b7d81
Dan Willemsen [Wed, 18 Oct 2017 06:17:09 +0000 (06:17 +0000)]
Merge "Use soong_ui directly, instead of make" am:
e994b4b584
am:
0531e5c647
Change-Id: Ic3fc61824852181512f941dbc57c158540546616
Dan Willemsen [Wed, 18 Oct 2017 06:10:06 +0000 (06:10 +0000)]
Merge "Use soong_ui directly, instead of make"
am:
e994b4b584
Change-Id: I406a02af2d5fd1accf5c53609af00f416669e18f
Dan Willemsen [Wed, 18 Oct 2017 06:00:51 +0000 (06:00 +0000)]
Merge "Use soong_ui directly, instead of make"
Dan Willemsen [Wed, 18 Oct 2017 00:46:41 +0000 (17:46 -0700)]
Use soong_ui directly, instead of make
This will use ckati instead of make for dumping variables, for
consistent makefile parsing. It may also sandbox executions, etc.
Also skip the legacy make wrapper to build, and use soong_ui instead.
The command line arguments are equivalent, but -j is no longer
necessary, we'll default to a sane value.
Test: bit -b framework
Change-Id: Idc2c9d1abe84b6b783b8702925de5493d47a4509
Jerry Zhang [Tue, 17 Oct 2017 20:47:51 +0000 (13:47 -0700)]
Add storageId to moveObjects
When moving between different storages, the storageId
must be changed as well.
Bug:
67028892
Test: Move between storages with virtual sdcard.
Change-Id: Ie82aa8d53686bfffb7c26b46a49524a00f2f0214
Jordan Liu [Tue, 17 Oct 2017 21:15:19 +0000 (21:15 +0000)]
Merge "Add config to skip showing CF fail-to-disable dialog" am:
d32138d78a
am:
a0df3496d3
Change-Id: Ic13004cc1c9afa5474df291211333e215ad96424
Jordan Liu [Tue, 17 Oct 2017 21:06:58 +0000 (21:06 +0000)]
Merge "Add config to skip showing CF fail-to-disable dialog"
am:
d32138d78a
Change-Id: I0bb3388b4f2e0243049316c3548aacf6f034ffd2
Jordan Liu [Tue, 17 Oct 2017 20:58:01 +0000 (20:58 +0000)]
Merge "Add config to skip showing CF fail-to-disable dialog"
Tom Cherry [Tue, 17 Oct 2017 19:47:57 +0000 (19:47 +0000)]
Merge "Frameworks: Remove warning for SystemProperties.get" am:
c589496ce9
am:
b72c0626f5
Change-Id: Ib0561d4ce3e027b2021bc6105f0be03ba6fffa99
Tom Cherry [Tue, 17 Oct 2017 19:37:45 +0000 (19:37 +0000)]
Merge "Frameworks: Remove warning for SystemProperties.get"
am:
c589496ce9
Change-Id: Ibef1415adec0dac324b0531b7038640c3584fdf1
Bookatz [Tue, 17 Oct 2017 19:35:22 +0000 (19:35 +0000)]
Merge "Batterystats handles nested unoptimized ble scans" am:
4627c01ee4 -s ours
am:
2fd6b1d7cd -s ours
Change-Id: Iaad1877f6fbdee2beaa2328a3b3ee5025c468426
Tom Cherry [Tue, 17 Oct 2017 19:28:07 +0000 (19:28 +0000)]
Merge "Frameworks: Remove warning for SystemProperties.get"
Bookatz [Tue, 17 Oct 2017 19:24:40 +0000 (19:24 +0000)]
Merge "Batterystats handles nested unoptimized ble scans"
am:
4627c01ee4 -s ours
Change-Id: I044d02d6b00f63573870643ad83fce11740dd498
Treehugger Robot [Tue, 17 Oct 2017 19:03:52 +0000 (19:03 +0000)]
Merge "Batterystats handles nested unoptimized ble scans"
Tom Cherry [Tue, 17 Oct 2017 16:20:01 +0000 (09:20 -0700)]
Frameworks: Remove warning for SystemProperties.get
We now disallow non-UTF8 property values directly in property_service,
so there is no need for this warning.
This partially reverts
33aea8d40e6cc99f7968a6c6605a81a4587b85e7.
Bug:
63177684
Test: make
Change-Id: I61f49f635c6095013f55b906e00925a8cbd1ea8c
DongYuchen [Thu, 16 Feb 2017 10:22:36 +0000 (18:22 +0800)]
Add config to skip showing CF fail-to-disable dialog
Add config to skip showing CF fail-to-disable dialog. Because it is not
always correct to show fail-to-disable dialog. It depends on the way
of NW CF handling. The default value is set to false.
Test: manual - checked the call forwarding fail dialog was not shown
Bug:
35790386
Change-Id: I8b0e3d15736d95df8fcac205cb9a3ef2f8579988
Sooraj Sasindran [Tue, 17 Oct 2017 06:19:46 +0000 (06:19 +0000)]
Merge "Enhance network scan request" am:
b9f49e671a
am:
d5987f9722
Change-Id: Ifb781febbb687036b15746f809499788b802566b
Sooraj Sasindran [Tue, 17 Oct 2017 06:11:06 +0000 (06:11 +0000)]
Merge "Enhance network scan request"
am:
b9f49e671a
Change-Id: If24d4740c346761391213f94647c43cbd742444a
Sooraj Sasindran [Tue, 17 Oct 2017 06:03:31 +0000 (06:03 +0000)]
Merge "Enhance network scan request"
Bookatz [Tue, 11 Jul 2017 23:49:17 +0000 (16:49 -0700)]
Batterystats handles nested unoptimized ble scans
When a ble scan starts, it tells batterystats whether that scan is
unoptimized. When the scan stops, batterystats is not informed of
whether the stopped scan was unoptimized. Because the ble scan call
could not be nested (couldn't call start twice without stopping first),
this was fine, but now nesting is possible, so batterystats needs to
know whether the stopped ble scan is unoptimized.
Bug:
63456783
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Test: no new errors when run cts-dev -m CtsIncidentHostTestCases -t com.android.server.cts.BatteryStatsValidationTest#testUnoptimizedBleScans
Change-Id: Ia73f294cf1807ddaf20f1c0bcc28add001cac78c
Merged-In: Ia73f294cf1807ddaf20f1c0bcc28add001cac78c
(cherry picked from commit
94c5a313d7313a9a88abdf4267af43b87deb0dd2)
Calin Juravle [Mon, 16 Oct 2017 23:11:10 +0000 (23:11 +0000)]
Merge "Revert "When updating a split app, copy compiled files from base.apk only."" am:
154535317e
am:
4a69261500
Change-Id: Icdd830af8054f0540e91afe739d794d35178db4c
Hall Liu [Mon, 16 Oct 2017 22:58:43 +0000 (22:58 +0000)]
Merge "Add null checks to EMBMS AIDL impls" am:
9e93a6515e
am:
7bfd87f169
Change-Id: I814c6e5a9032c6a28c2b3087311d6c51647e0bc4
Calin Juravle [Mon, 16 Oct 2017 22:51:45 +0000 (22:51 +0000)]
Merge "Revert "When updating a split app, copy compiled files from base.apk only.""
am:
154535317e
Change-Id: Ia91f126900e3c52016af233f33c47b0a3c38d111
Hall Liu [Mon, 16 Oct 2017 22:44:48 +0000 (22:44 +0000)]
Merge "Add null checks to EMBMS AIDL impls"
am:
9e93a6515e
Change-Id: I888b5772fca069b638f1c2d0f803cf3863b7ff85
Calin Juravle [Mon, 16 Oct 2017 22:26:06 +0000 (22:26 +0000)]
Merge "Revert "When updating a split app, copy compiled files from base.apk only.""
Hall Liu [Mon, 16 Oct 2017 22:04:17 +0000 (22:04 +0000)]
Merge "Add null checks to EMBMS AIDL impls"
Chih-hung Hsieh [Mon, 16 Oct 2017 19:35:24 +0000 (19:35 +0000)]
Merge "Use -Werror in frameworks/base" am:
16fbd3a1d8
am:
0bfb717a37
Change-Id: I106827dd37a33cfcd956b2a1a3e48bd09576eadb
Chih-hung Hsieh [Mon, 16 Oct 2017 19:24:53 +0000 (19:24 +0000)]
Merge "Use -Werror in frameworks/base"
am:
16fbd3a1d8
Change-Id: Iab69cf4f99cf4bedd12eb7764c773a893bfe5343
Chih-hung Hsieh [Mon, 16 Oct 2017 19:13:22 +0000 (19:13 +0000)]
Merge "Use -Werror in frameworks/base"