307978 Commits

Author SHA1 Message Date
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

Change-Id: I2cef23ff183428041273007cf9bb1b655f92372a
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

Change-Id: I183dfdb5e8193051424fa5fb5c4f5ad6d4d0c741
2017-02-16 14:45:42 +00:00
Etan Cohen
fcc8afcc7d Merge changes from topic 'cm_request_to' am: 6fb97e8fd8 am: ede9f94e32
am: c3f0f5f3de

Change-Id: Ief32189b0f6f2c70d7e4097f70dbdf8195bd8713
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

Change-Id: I31fbce5bab0d03b9b468f4fc5e819a59027aca7b
2017-02-16 14:37:26 +00:00
Etan Cohen
c3f0f5f3de Merge changes from topic 'cm_request_to' am: 6fb97e8fd8
am: ede9f94e32

Change-Id: I2720e64e4af88df9d3a7b6209e9fcef4a0340986
2017-02-16 14:29:29 +00:00
Etan Cohen
aae1411a93 [CM] Remove non-functional timeout from request network am: e9aea9d397
am: a6be89aa40

Change-Id: Ie00ac8dee9302fafc0cdad95ec08d376ad908ab9
2017-02-16 14:28:29 +00:00
Etan Cohen
ede9f94e32 Merge changes from topic 'cm_request_to'
am: 6fb97e8fd8

Change-Id: I9ca18c0570be831ab37cdf200c28b0778117198d
2017-02-16 14:23:18 +00:00
Etan Cohen
a6be89aa40 [CM] Remove non-functional timeout from request network
am: e9aea9d397

Change-Id: Ica347b2c2181fe04a7efb2769d7498a31c888e5a
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

Change-Id: I6655ce33890d65be844b7a8e471ebf12ed800a6c
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

Change-Id: Ia47be383cbc07818a7a51f85bfba4a30aedd3a5a
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

Change-Id: Ic5965ea14b7b1b68b261b554063f5aae473a117d
2017-02-16 13:18:22 +00:00
Hemant Gupta
ff3f4e72af Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation." am: 3ac3170a4b
am: 1112046506

Change-Id: Ib406bdcd0f388c7fe1f226da2ae17a2c588739c9
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

Change-Id: I2b4719d6f50533f62af22d55fb870802ead7c554
2017-02-16 13:14:19 +00:00
Hemant Gupta
1112046506 Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation."
am: 3ac3170a4b

Change-Id: I477f407d94a43a14083fa68a7b271f5d4fe8445d
2017-02-16 13:10:19 +00:00
Shigeki Yokomichi
4b06345751 Merge "Fix the "Alarm volume" icon is displayed incorrectly" am: e0ba81110a
am: 657abc315d

Change-Id: I295d50e9513775dddb2aea3686275264d7e0f12c
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

Change-Id: Id7996cd16fea9eccbdcd389206e77d7390cd25a2
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
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

Change-Id: Iaa162a8661ca5cec350696ce71661c99d8fd1196
2017-02-16 07:21:13 +00:00
Hugo Benichi
35f3288b2f Merge "Captive portal: better detect empty responses" am: c217f7a9f3 am: af8e749820
am: 7973ff4c13

Change-Id: I63a3bf9f2983bdb68df7ef48b334930a089648eb
2017-02-16 07:12:55 +00:00
Hugo Benichi
7973ff4c13 Merge "Captive portal: better detect empty responses" am: c217f7a9f3
am: af8e749820

Change-Id: I0b2cd45fb92e2f8accb53ef4e050d2b6e7f7fd1c
2017-02-16 07:08:27 +00:00
Hugo Benichi
af8e749820 Merge "Captive portal: better detect empty responses"
am: c217f7a9f3

Change-Id: If6229a3a5c0ccc3575d44d11ed9f486cab35eac3
2017-02-16 07:04:25 +00:00
Hugo Benichi
c217f7a9f3 Merge "Captive portal: better detect empty responses" 2017-02-16 06:54:48 +00:00
TreeHugger Robot
55ab689fac Merge "Auto-grant background execution and data access" 2017-02-16 06:51:08 +00:00
Tomasz Mikolajewski
17c50da4be Change EXTRA_QUICK_VIEW_PLAIN to EXTRA_QUICK_VIEW_ADVANCED.
Test: Not testable, as the behavior depends on the quick viewer.
Bug: 32161075
Change-Id: I46ec36fdce481930096f9ae8ee3c54df792b0233
2017-02-16 14:53:57 +09:00
Yohei Yukawa
ee2a7ed3d9 Allow setImeWindowStatus with null startInputToken
This is a follow up CL to my previous CL [1], which caused an unexpected
side effect that leads the current IME to crash due to a too strict
requiremnt.

It turns out that it was too early for us to start requiring non-null
StartInputToken in InputMethodManagerService#setImeWindowStatus()
because in many places we have assumed that an IME can show/hide its
software keyboard even before an IME target window is associated with
the IME.

There are two major cases that we missed:

 - InputMethodManager#showSoftInputFromInputMethod(IBinder, int):

   This method does not require that the calling IME is already bound
   to an IME target window.

 - InputMethodManager#showSoftInputUnchecked(int ,ResultReceiver):

   This @hide method allows the caller application to let current IME
   show the software keyboard with bypassing all the normal focus
   management tasks in InputMethodManager.  We should seriously
   consider to deprecate this @hide method, but to do that we have to
   clean up some internal components and SearchView in the support
   library that still rely on this method.

Bug 35395372 is triggered by the second scenario, but until we sort out
all the possible corner cases, we should allow null startInputToken as a
valid request, like we had have done so before the CL [1] introduced
such a validation.

 [1]: I9921b381e02106dbffff5e0b3d13f0a1245ce807
      6db3bfe33d92127d203ec872a0b353585a99f256

Test: Made sure Bug 35395372 is no longer reproducible, that is,
      1. Flash a new image and complete the setup wizard on a
         direct-boot unaware device.
      2. Set a device password and require it upon each device boot.
      3. adb reboot
      4. Observe the default IME does not crash because of
         InvalidParameterException thrown by IMMS.
Test: Made sure IMM#showSoftInputFromInputMethod(IBinder, int) does
      not throw an InvalidParameterException even in an extreme case.
      1. Rebuild LatinIME with the following code in LatinIME.java
       @Override
       public AbstractInputMethodImpl onCreateInputMethodInterface() {
           return new InputMethodService.InputMethodImpl() {
               @Override
               public void attachToken(IBinder token) {
                   super.attachToken(token);

                   final InputMethodManager imm =
                       getSystemService(InputMethodManager.class);
                   final IBinder imeToken =
                       getWindow().getWindow().getAttributes().token;
                   imm.showSoftInputFromInputMethod(imeToken, 0);
               }
           };
       }
      2. adb install -r LatinIME.apk
      3. adb shell ime enable com.android.inputmethod.latin/.LatinIME
      4. adb shell ime set com.android.inputmethod.latin/.LatinIME
      5. Tap any text field.
      4. Observe LatinIME does not crash because of
         InvalidParameterException thrown by IMMS.
Bug: 34628091
Bug: 35079353
Fixes: 35395372
Change-Id: Ib9448c551d9a30776a999c27a5ff20f1a095633a
2017-02-15 21:38:57 -08:00
TreeHugger Robot
ff4adef9cd Merge "Create TRON events for Wifi Network Recommendations." 2017-02-16 05:25:52 +00:00