TreeHugger Robot
d663b483d1
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2017-02-16 15:37:17 +00:00
Bill Yi
12adaa125e
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: aeab162647
2017-02-16 15:36:59 +00:00
Bill Yi
293322635c
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: 495542837c
2017-02-16 15:33:36 +00:00
Bill Yi
2b8164620f
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: ea62e92c27
2017-02-16 15:32:32 +00:00
Bill Yi
1d8f1bd0b2
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: 0860f41afc
2017-02-16 15:31:22 +00:00
TreeHugger Robot
c527941449
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2017-02-16 15:29:39 +00:00
TreeHugger Robot
aeab162647
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2017-02-16 15:29:09 +00:00
TreeHugger Robot
495542837c
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2017-02-16 15:25:34 +00:00
TreeHugger Robot
ea62e92c27
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2017-02-16 15:25:03 +00:00
TreeHugger Robot
0860f41afc
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2017-02-16 15:24:31 +00:00
TreeHugger Robot
78e1375a67
Merge "Moved bugreport intents to the com.android.internal namespace."
2017-02-16 15:16:26 +00:00
Shreyas Basarge
2d096ee435
Fix NPE in BackupManagerService
...
If none of the requested packages are valid packages,
we'd run into this issue where PerformBackupTask#mQueue
is null but we try to iterate over it in finalizeBackup()
Fix is to use an empty queue as the default value instead
of null.
Bug: 35380067
Test: Manually tested by trying to backup a non-existent package.
Change-Id: Ibb2d03d5f8270bcb448ee083ee02964236aca92b
2017-02-16 14:54:47 +00:00
Etan Cohen
c454a74514
Merge changes from topic 'cm_request_to' am: 6fb97e8fd8 am: ede9f94e32 am: c3f0f5f3de
...
am: fcc8afcc7d
2017-02-16 14:46:52 +00:00
Etan Cohen
1e1c5b8cb8
[CM] Remove non-functional timeout from request network am: e9aea9d397 am: a6be89aa40 am: aae1411a93
...
am: e74978c047
2017-02-16 14:45:42 +00:00
Etan Cohen
fcc8afcc7d
Merge changes from topic 'cm_request_to' am: 6fb97e8fd8 am: ede9f94e32
...
am: c3f0f5f3de
2017-02-16 14:38:28 +00:00
Narayan Kamath
03d82b2ea3
Track libcore change d7d594236d66c4d595f7622a264fd51.
...
Test: make update-api docs
Change-Id: Icfe470034b53afff60469d5bcfd58d959cea2488
2017-02-16 14:37:39 +00:00
Etan Cohen
e74978c047
[CM] Remove non-functional timeout from request network am: e9aea9d397 am: a6be89aa40
...
am: aae1411a93
2017-02-16 14:37:26 +00:00
Etan Cohen
c3f0f5f3de
Merge changes from topic 'cm_request_to' am: 6fb97e8fd8
...
am: ede9f94e32
2017-02-16 14:29:29 +00:00
Etan Cohen
aae1411a93
[CM] Remove non-functional timeout from request network am: e9aea9d397
...
am: a6be89aa40
2017-02-16 14:28:29 +00:00
Etan Cohen
ede9f94e32
Merge changes from topic 'cm_request_to'
...
am: 6fb97e8fd8
2017-02-16 14:23:18 +00:00
Etan Cohen
a6be89aa40
[CM] Remove non-functional timeout from request network
...
am: e9aea9d397
2017-02-16 14:21:44 +00:00
Shreyas Basarge
0277db478d
Better iteration over mCurrentOperations in cancelBackups
...
handleCancel was being called on an operation
while we are iterating over all operations.
This can cause issues if handleCancel modifies
the array containing all operations.
Test: Run cancelBackup GTS tests.
Change-Id: If3fbe7b5d9e61aa870f8f6e0dd1654e735c0c5b8
2017-02-16 14:16:14 +00:00
Etan Cohen
6fb97e8fd8
Merge changes from topic 'cm_request_to'
...
* changes:
[CM] Remove maximum timeout value for request network
[CM] Remove non-functional timeout from request network
2017-02-16 14:15:44 +00:00
Etan Cohen
ba07c8c4ec
[CM] Remove maximum timeout value for request network
...
The request network with timeout was originally created with a
check of max timeout against a constant of 100 minutes. However,
the API was not public and did not implement a timeout. Any users
were internal and never got any onUnavailable() callback (since
timeout never triggered).
There is no reason to have a max timeout so the constant is
remove.
Bug: 31399536
Test: unit tests and CTS of ConnectivityManager
Change-Id: Icbedfb4299d75b6a7e3e43720111531f1faafd06
2017-02-16 14:15:16 +00:00
Jerome Gaillard
65febdd300
Merge "Fix LayoutlibTestCallback.getResourceId"
2017-02-16 13:31:38 +00:00
Jerome Gaillard
677f0d6c7c
Merge "Update asm version in layoutlib following Change I2a6396e7"
2017-02-16 13:30:22 +00:00
Hemant Gupta
95939990ee
Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation." am: 3ac3170a4b am: 1112046506 am: ff3f4e72af
...
am: 853d024b98
2017-02-16 13:24:18 +00:00
Shigeki Yokomichi
df47bee061
Merge "Fix the "Alarm volume" icon is displayed incorrectly" am: e0ba81110a am: 657abc315d am: 4b06345751
...
am: bce364b776
2017-02-16 13:23:02 +00:00
Hemant Gupta
853d024b98
Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation." am: 3ac3170a4b am: 1112046506
...
am: ff3f4e72af
2017-02-16 13:18:22 +00:00
Hemant Gupta
ff3f4e72af
Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation." am: 3ac3170a4b
...
am: 1112046506
2017-02-16 13:14:22 +00:00
Shigeki Yokomichi
bce364b776
Merge "Fix the "Alarm volume" icon is displayed incorrectly" am: e0ba81110a am: 657abc315d
...
am: 4b06345751
2017-02-16 13:14:19 +00:00
Hemant Gupta
1112046506
Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation."
...
am: 3ac3170a4b
2017-02-16 13:10:19 +00:00
Shigeki Yokomichi
4b06345751
Merge "Fix the "Alarm volume" icon is displayed incorrectly" am: e0ba81110a
...
am: 657abc315d
2017-02-16 13:06:27 +00:00
Treehugger Robot
3ac3170a4b
Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation."
2017-02-16 12:59:16 +00:00
Shigeki Yokomichi
657abc315d
Merge "Fix the "Alarm volume" icon is displayed incorrectly"
...
am: e0ba81110a
2017-02-16 12:58:17 +00:00
TreeHugger Robot
cc5b6a4347
Merge "Change EXTRA_QUICK_VIEW_PLAIN to EXTRA_QUICK_VIEW_ADVANCED."
2017-02-16 12:54:55 +00:00
Bill Yi
d236ff79b9
Import translations. DO NOT MERGE
...
Change-Id: I3ee5f071cb664f57f316b70a4036973aba9312bd
Auto-generated-cl: translation import
2017-02-16 04:54:38 -08:00
Treehugger Robot
e0ba81110a
Merge "Fix the "Alarm volume" icon is displayed incorrectly"
2017-02-16 12:47:43 +00:00
Narayan Kamath
b3003af0f6
Merge "Zygote: Explicitly preload secondary zygote resources."
2017-02-16 12:31:07 +00:00
Diego Perez
102ef6fd53
Merge "Set the correct class loader in Resources"
2017-02-16 12:14:14 +00:00
Bartosz Fabianowski
aff5e9c21c
Add API for checking whether the default IME was set by the DO/PO
...
With this API, the system can determine whether a user's default
IME was set by the user or the user's DO/PO.
Bug: 32692748
Test: DPMS unit tests and CTS CtsDevicePolicyManagerTestCases
Change-Id: Ibd703ff5c9e4c072599ad8d6023c94a97d728109
2017-02-16 13:07:11 +01:00
Bill Yi
705f732f24
Import translations. DO NOT MERGE
...
Change-Id: If44132000703aba49ea891bd59b3006c7cc8dc31
Auto-generated-cl: translation import
2017-02-16 03:29:57 -08:00
Bill Yi
e13670c036
Import translations. DO NOT MERGE
...
Change-Id: I10af9bcccabc29f816d9602bc0a371aef8fb3e77
Auto-generated-cl: translation import
2017-02-16 02:52:18 -08:00
Bill Yi
999923709f
Import translations. DO NOT MERGE
...
Change-Id: I3ee247ad24da92edcf93e0edadcddcce8bda17b5
Auto-generated-cl: translation import
2017-02-16 02:48:51 -08:00
Bill Yi
b1fb46745a
Import translations. DO NOT MERGE
...
Change-Id: I95db0b4941fbfbd4ad6bf625de876ffdc07210e6
Auto-generated-cl: translation import
2017-02-16 02:31:50 -08:00
Bill Yi
9f4a2d427a
Import translations. DO NOT MERGE
...
Change-Id: I5987eba5f40b632fd475e57fb8c8ff1343b2d6bc
Auto-generated-cl: translation import
2017-02-16 02:16:44 -08:00
TreeHugger Robot
e0da063b8d
Merge "MediaSessionService: Keep media session list in one place"
2017-02-16 09:57:09 +00:00
Jaewan Kim
e0ca3f3882
MediaSessionService: Keep media session list in one place
...
Test: Manual test
Change-Id: I954a3c6881ba415d3800ac1a2ce16b424d1a0f73
2017-02-16 17:15:52 +09:00
Hugo Benichi
5a93b9c940
Merge "Captive portal: better detect empty responses" am: c217f7a9f3 am: af8e749820 am: 7973ff4c13
...
am: 35f3288b2f
2017-02-16 07:21:13 +00:00
Hugo Benichi
35f3288b2f
Merge "Captive portal: better detect empty responses" am: c217f7a9f3 am: af8e749820
...
am: 7973ff4c13
2017-02-16 07:12:55 +00:00
