OSDN Git Service
Makoto Onuki [Thu, 16 Feb 2017 17:57:58 +0000 (17:57 +0000)]
Merge "Make the DPM account strings system-APIs."
Diego Perez [Thu, 16 Feb 2017 17:47:06 +0000 (17:47 +0000)]
Merge "Add BridgeXmlPullAttributesTest to the Main suite"
TreeHugger Robot [Thu, 16 Feb 2017 17:45:26 +0000 (17:45 +0000)]
Merge "SystemUI: Disable LeakReporterTest"
Narayan Kamath [Thu, 16 Feb 2017 17:36:19 +0000 (17:36 +0000)]
Merge "Track libcore change
d7d594236d66c4d595f7622a264fd51." am:
97ebc29e9c am:
b872486722 am:
26e655f397
am:
0c77d181f3
Change-Id: I7ab01e2531d9d684759bdd2e9a5410288cfd52b4
Felipe Leme [Thu, 16 Feb 2017 17:31:44 +0000 (17:31 +0000)]
Merge "Pass FillResponse extra back to onSaveRequest(...)."
Narayan Kamath [Thu, 16 Feb 2017 17:31:41 +0000 (17:31 +0000)]
Merge "Track libcore change
d7d594236d66c4d595f7622a264fd51." am:
97ebc29e9c am:
b872486722
am:
26e655f397
Change-Id: I85b862ddf9f0e1b5dc48197075616bebdabf8c1a
TreeHugger Robot [Thu, 16 Feb 2017 17:29:32 +0000 (17:29 +0000)]
Merge "Allow setImeWindowStatus with null startInputToken"
Nick Kralevich [Thu, 16 Feb 2017 17:24:40 +0000 (17:24 +0000)]
Merge "system_server: add CAP_SYS_PTRACE"
Narayan Kamath [Thu, 16 Feb 2017 17:24:40 +0000 (17:24 +0000)]
Merge "Track libcore change
d7d594236d66c4d595f7622a264fd51." am:
97ebc29e9c
am:
b872486722
Change-Id: Ia7111f2be312494fbdb816efae9a7b465ce6b1a4
Narayan Kamath [Thu, 16 Feb 2017 17:20:26 +0000 (17:20 +0000)]
Merge "Track libcore change
d7d594236d66c4d595f7622a264fd51."
am:
97ebc29e9c
Change-Id: Ied575c14661753a56241f0cea62391b057ab4316
Narayan Kamath [Thu, 16 Feb 2017 17:12:48 +0000 (17:12 +0000)]
Shreyas Basarge [Thu, 16 Feb 2017 16:42:55 +0000 (16:42 +0000)]
Merge "Better iteration over mCurrentOperations in cancelBackups"
Winson Chung [Thu, 16 Feb 2017 16:39:57 +0000 (16:39 +0000)]
Merge "Reducing number of configuration changes during PiP transition."
Neil Fuller [Thu, 16 Feb 2017 16:20:41 +0000 (16:20 +0000)]
Merge "TimeZoneBundleInstaller -> TimeZoneDistroInstaller" am:
eb82e3de87 am:
c1867dedfa am:
4f5f211f72
am:
03b89cdfb3
Change-Id: I831b29b0da995aca9c6e16d328f49d7771dd10db
Neil Fuller [Thu, 16 Feb 2017 16:14:00 +0000 (16:14 +0000)]
Merge "TimeZoneBundleInstaller -> TimeZoneDistroInstaller" am:
eb82e3de87 am:
c1867dedfa
am:
4f5f211f72
Change-Id: If08545341c1bdcd79b7b16ed1da0f16b924cdea0
Neil Fuller [Thu, 16 Feb 2017 16:09:10 +0000 (16:09 +0000)]
Merge "TimeZoneBundleInstaller -> TimeZoneDistroInstaller" am:
eb82e3de87
am:
c1867dedfa
Change-Id: If2f639d07a44861b96b4497cc3dc02364dc85c51
Felipe Leme [Thu, 16 Feb 2017 16:04:19 +0000 (16:04 +0000)]
Merge "Add URL on ViewStructure."
Neil Fuller [Thu, 16 Feb 2017 16:02:33 +0000 (16:02 +0000)]
Merge "TimeZoneBundleInstaller -> TimeZoneDistroInstaller"
am:
eb82e3de87
Change-Id: I7666ae9c9472f11cafe0df5a2f259df1c499d44b
Bill Yi [Thu, 16 Feb 2017 15:53:37 +0000 (15:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
d663b483d1 -s ours
am:
7ab32a6a1f -s ours
Change-Id: Idfa9d92b40fed386369d648a11d7f39695e3ba9a
Neil Fuller [Thu, 16 Feb 2017 15:51:26 +0000 (15:51 +0000)]
Merge "TimeZoneBundleInstaller -> TimeZoneDistroInstaller"
Bill Yi [Thu, 16 Feb 2017 15:46:11 +0000 (15:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
d663b483d1 -s ours
Change-Id: I2ca0a1321763042be06e780dd89902810769ee3e
Bill Yi [Thu, 16 Feb 2017 15:44:12 +0000 (15:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
c527941449 -s ours
am:
51df670652 -s ours
Change-Id: I472ecff59c06ee733f639c292e8d44439678b4d2
Bill Yi [Thu, 16 Feb 2017 15:43:05 +0000 (15:43 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
aeab162647 -s ours
am:
12adaa125e -s ours
Change-Id: If3096bf1b094c844ce00992ce9e464b01e8eb47b
Bill Yi [Thu, 16 Feb 2017 15:40:14 +0000 (15:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
495542837c -s ours
am:
293322635c -s ours
Change-Id: I9f01df2ba8ffb458d56b991719a40ad5cb9f9f39
Bill Yi [Thu, 16 Feb 2017 15:39:10 +0000 (15:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
ea62e92c27 -s ours
am:
2b8164620f -s ours
Change-Id: I14e677d8e0ebe7a4dd11885698154ea130df701c
Bill Yi [Thu, 16 Feb 2017 15:38:05 +0000 (15:38 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
0860f41afc -s ours
am:
1d8f1bd0b2 -s ours
Change-Id: Ifbb72d371976b1dd1699a84afb318f1420caa0a8
Bill Yi [Thu, 16 Feb 2017 15:38:04 +0000 (15:38 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
c527941449 -s ours
Change-Id: Icf5989d2e0cd7dc95fab6507067520a961b08be7
TreeHugger Robot [Thu, 16 Feb 2017 15:37:11 +0000 (15:37 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Thu, 16 Feb 2017 15:36:59 +0000 (15:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
aeab162647 -s ours
Change-Id: Idb3a2c8387b8faac48c0d63d1f6c2fa84b1fb73e
Bill Yi [Thu, 16 Feb 2017 15:33:36 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
495542837c -s ours
Change-Id: I35a3f583390c5a03682680921cc593e48fb77f88
Bill Yi [Thu, 16 Feb 2017 15:32:32 +0000 (15:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
ea62e92c27 -s ours
Change-Id: I0cde2e97d2d4ed8659b06ecae96c57a32f501e09
Bill Yi [Thu, 16 Feb 2017 15:31:22 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
0860f41afc -s ours
Change-Id: I6df27fbf95cc22ef8988730a1d7f244949fa838c
TreeHugger Robot [Thu, 16 Feb 2017 15:29:35 +0000 (15:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 16 Feb 2017 15:29:05 +0000 (15:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 16 Feb 2017 15:25:29 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 16 Feb 2017 15:24:59 +0000 (15:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 16 Feb 2017 15:24:27 +0000 (15:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 16 Feb 2017 15:16:21 +0000 (15:16 +0000)]
Merge "Moved bugreport intents to the com.android.internal namespace."
Etan Cohen [Thu, 16 Feb 2017 14:46:52 +0000 (14:46 +0000)]
Merge changes from topic 'cm_request_to' am:
6fb97e8fd8 am:
ede9f94e32 am:
c3f0f5f3de
am:
fcc8afcc7d
Change-Id: I2cef23ff183428041273007cf9bb1b655f92372a
Etan Cohen [Thu, 16 Feb 2017 14:45:42 +0000 (14:45 +0000)]
[CM] Remove non-functional timeout from request network am:
e9aea9d397 am:
a6be89aa40 am:
aae1411a93
am:
e74978c047
Change-Id: I183dfdb5e8193051424fa5fb5c4f5ad6d4d0c741
Etan Cohen [Thu, 16 Feb 2017 14:38:28 +0000 (14:38 +0000)]
Merge changes from topic 'cm_request_to' am:
6fb97e8fd8 am:
ede9f94e32
am:
c3f0f5f3de
Change-Id: Ief32189b0f6f2c70d7e4097f70dbdf8195bd8713
Narayan Kamath [Thu, 16 Feb 2017 14:37:39 +0000 (14:37 +0000)]
Track libcore change
d7d594236d66c4d595f7622a264fd51.
Test: make update-api docs
Change-Id: Icfe470034b53afff60469d5bcfd58d959cea2488
Etan Cohen [Thu, 16 Feb 2017 14:37:26 +0000 (14:37 +0000)]
[CM] Remove non-functional timeout from request network am:
e9aea9d397 am:
a6be89aa40
am:
aae1411a93
Change-Id: I31fbce5bab0d03b9b468f4fc5e819a59027aca7b
Etan Cohen [Thu, 16 Feb 2017 14:29:29 +0000 (14:29 +0000)]
Merge changes from topic 'cm_request_to' am:
6fb97e8fd8
am:
ede9f94e32
Change-Id: I2720e64e4af88df9d3a7b6209e9fcef4a0340986
Etan Cohen [Thu, 16 Feb 2017 14:28:29 +0000 (14:28 +0000)]
[CM] Remove non-functional timeout from request network am:
e9aea9d397
am:
a6be89aa40
Change-Id: Ie00ac8dee9302fafc0cdad95ec08d376ad908ab9
Etan Cohen [Thu, 16 Feb 2017 14:23:18 +0000 (14:23 +0000)]
Merge changes from topic 'cm_request_to'
am:
6fb97e8fd8
Change-Id: I9ca18c0570be831ab37cdf200c28b0778117198d
Etan Cohen [Thu, 16 Feb 2017 14:21:44 +0000 (14:21 +0000)]
[CM] Remove non-functional timeout from request network
am:
e9aea9d397
Change-Id: Ica347b2c2181fe04a7efb2769d7498a31c888e5a
Shreyas Basarge [Thu, 16 Feb 2017 00:56:59 +0000 (00:56 +0000)]
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
Etan Cohen [Thu, 16 Feb 2017 14:15:43 +0000 (14:15 +0000)]
Merge changes from topic 'cm_request_to'
* changes:
[CM] Remove maximum timeout value for request network
[CM] Remove non-functional timeout from request network
Etan Cohen [Sun, 5 Feb 2017 18:42:27 +0000 (10:42 -0800)]
[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
Jerome Gaillard [Thu, 16 Feb 2017 13:31:32 +0000 (13:31 +0000)]
Merge "Fix LayoutlibTestCallback.getResourceId"
Jerome Gaillard [Thu, 16 Feb 2017 13:30:17 +0000 (13:30 +0000)]
Merge "Update asm version in layoutlib following Change I2a6396e7"
Hemant Gupta [Thu, 16 Feb 2017 13:24:18 +0000 (13:24 +0000)]
Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation." am:
3ac3170a4b am:
1112046506 am:
ff3f4e72af
am:
853d024b98
Change-Id: I6655ce33890d65be844b7a8e471ebf12ed800a6c
Shigeki Yokomichi [Thu, 16 Feb 2017 13:23:02 +0000 (13:23 +0000)]
Merge "Fix the "Alarm volume" icon is displayed incorrectly" am:
e0ba81110a am:
657abc315d am:
4b06345751
am:
bce364b776
Change-Id: Ia47be383cbc07818a7a51f85bfba4a30aedd3a5a
Hemant Gupta [Thu, 16 Feb 2017 13:18:22 +0000 (13:18 +0000)]
Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation." am:
3ac3170a4b am:
1112046506
am:
ff3f4e72af
Change-Id: Ic5965ea14b7b1b68b261b554063f5aae473a117d
Hemant Gupta [Thu, 16 Feb 2017 13:14:22 +0000 (13:14 +0000)]
Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation." am:
3ac3170a4b
am:
1112046506
Change-Id: Ib406bdcd0f388c7fe1f226da2ae17a2c588739c9
Shigeki Yokomichi [Thu, 16 Feb 2017 13:14:19 +0000 (13:14 +0000)]
Merge "Fix the "Alarm volume" icon is displayed incorrectly" am:
e0ba81110a am:
657abc315d
am:
4b06345751
Change-Id: I2b4719d6f50533f62af22d55fb870802ead7c554
Hemant Gupta [Thu, 16 Feb 2017 13:10:19 +0000 (13:10 +0000)]
Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation."
am:
3ac3170a4b
Change-Id: I477f407d94a43a14083fa68a7b271f5d4fe8445d
Shigeki Yokomichi [Thu, 16 Feb 2017 13:06:27 +0000 (13:06 +0000)]
Merge "Fix the "Alarm volume" icon is displayed incorrectly" am:
e0ba81110a
am:
657abc315d
Change-Id: I295d50e9513775dddb2aea3686275264d7e0f12c
Treehugger Robot [Thu, 16 Feb 2017 12:59:15 +0000 (12:59 +0000)]
Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation."
Shigeki Yokomichi [Thu, 16 Feb 2017 12:58:17 +0000 (12:58 +0000)]
Merge "Fix the "Alarm volume" icon is displayed incorrectly"
am:
e0ba81110a
Change-Id: Id7996cd16fea9eccbdcd389206e77d7390cd25a2
TreeHugger Robot [Thu, 16 Feb 2017 12:54:50 +0000 (12:54 +0000)]
Merge "Change EXTRA_QUICK_VIEW_PLAIN to EXTRA_QUICK_VIEW_ADVANCED."
Bill Yi [Thu, 16 Feb 2017 12:54:38 +0000 (04:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3ee5f071cb664f57f316b70a4036973aba9312bd
Auto-generated-cl: translation import
Treehugger Robot [Thu, 16 Feb 2017 12:47:41 +0000 (12:47 +0000)]
Merge "Fix the "Alarm volume" icon is displayed incorrectly"
Narayan Kamath [Thu, 16 Feb 2017 12:31:01 +0000 (12:31 +0000)]
Merge "Zygote: Explicitly preload secondary zygote resources."
Diego Perez [Thu, 16 Feb 2017 12:14:09 +0000 (12:14 +0000)]
Merge "Set the correct class loader in Resources"
Bill Yi [Thu, 16 Feb 2017 11:29:57 +0000 (03:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: If44132000703aba49ea891bd59b3006c7cc8dc31
Auto-generated-cl: translation import
Bill Yi [Thu, 16 Feb 2017 10:52:18 +0000 (02:52 -0800)]
Import translations. DO NOT MERGE
Change-Id: I10af9bcccabc29f816d9602bc0a371aef8fb3e77
Auto-generated-cl: translation import
Bill Yi [Thu, 16 Feb 2017 10:48:51 +0000 (02:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3ee247ad24da92edcf93e0edadcddcce8bda17b5
Auto-generated-cl: translation import
Bill Yi [Thu, 16 Feb 2017 10:31:50 +0000 (02:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: I95db0b4941fbfbd4ad6bf625de876ffdc07210e6
Auto-generated-cl: translation import
Bill Yi [Thu, 16 Feb 2017 10:16:44 +0000 (02:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5987eba5f40b632fd475e57fb8c8ff1343b2d6bc
Auto-generated-cl: translation import
TreeHugger Robot [Thu, 16 Feb 2017 09:57:04 +0000 (09:57 +0000)]
Merge "MediaSessionService: Keep media session list in one place"
Jaewan Kim [Thu, 16 Feb 2017 06:52:39 +0000 (15:52 +0900)]
MediaSessionService: Keep media session list in one place
Test: Manual test
Change-Id: I954a3c6881ba415d3800ac1a2ce16b424d1a0f73
Hugo Benichi [Thu, 16 Feb 2017 07:21:13 +0000 (07:21 +0000)]
Merge "Captive portal: better detect empty responses" am:
c217f7a9f3 am:
af8e749820 am:
7973ff4c13
am:
35f3288b2f
Change-Id: Iaa162a8661ca5cec350696ce71661c99d8fd1196
Hugo Benichi [Thu, 16 Feb 2017 07:12:55 +0000 (07:12 +0000)]
Merge "Captive portal: better detect empty responses" am:
c217f7a9f3 am:
af8e749820
am:
7973ff4c13
Change-Id: I63a3bf9f2983bdb68df7ef48b334930a089648eb
Hugo Benichi [Thu, 16 Feb 2017 07:08:27 +0000 (07:08 +0000)]
Merge "Captive portal: better detect empty responses" am:
c217f7a9f3
am:
af8e749820
Change-Id: I0b2cd45fb92e2f8accb53ef4e050d2b6e7f7fd1c
Hugo Benichi [Thu, 16 Feb 2017 07:04:25 +0000 (07:04 +0000)]
Merge "Captive portal: better detect empty responses"
am:
c217f7a9f3
Change-Id: If6229a3a5c0ccc3575d44d11ed9f486cab35eac3
Hugo Benichi [Thu, 16 Feb 2017 06:54:46 +0000 (06:54 +0000)]
Merge "Captive portal: better detect empty responses"
TreeHugger Robot [Thu, 16 Feb 2017 06:51:04 +0000 (06:51 +0000)]
Merge "Auto-grant background execution and data access"
Tomasz Mikolajewski [Thu, 16 Feb 2017 05:38:04 +0000 (14:38 +0900)]
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
Yohei Yukawa [Thu, 16 Feb 2017 05:38:57 +0000 (21:38 -0800)]
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
TreeHugger Robot [Thu, 16 Feb 2017 05:25:48 +0000 (05:25 +0000)]
Merge "Create TRON events for Wifi Network Recommendations."
TreeHugger Robot [Thu, 16 Feb 2017 05:00:44 +0000 (05:00 +0000)]
Merge "Introduce Backspace implemenation for flag emoji sequence."
TreeHugger Robot [Thu, 16 Feb 2017 05:00:03 +0000 (05:00 +0000)]
Merge "Always check front stack on its current display"
TreeHugger Robot [Thu, 16 Feb 2017 04:36:52 +0000 (04:36 +0000)]
Merge "Minor fixes on documentation."
Svet Ganov [Wed, 15 Feb 2017 18:28:51 +0000 (10:28 -0800)]
Auto-grant background execution and data access
Companion apps can declare they want background access and
background execution exceptions via dedicated permissions
in their manifest. If such a permission is requested we
auto-grant the corresponding exception after the user has
chosen a device from the companion UI. These permissions
are appop ones allowing us to use the app ops for gauging
whether the user has made a change after we auto-granted
the permission since we would like to revoke these special
privileges when the app disassociates itself from the
companion device if the user did not make an excplicit
choice otherwise.
While at this auto-grant fixed location permission to the
companion device discovery service.
Test: manual
Change-Id: I46ee4291e5e5a8f7613f0dd75eb61d6b9341f306
Selim Cinek [Thu, 16 Feb 2017 04:21:28 +0000 (04:21 +0000)]
Merge "Fixes a bug where children could have a colored background"
Hassan Shojania [Thu, 16 Feb 2017 03:45:54 +0000 (03:45 +0000)]
Merge "Modular DRM for MediaPlayer"
Aaron Whyte [Thu, 16 Feb 2017 03:41:21 +0000 (03:41 +0000)]
Merge "Revert "Re-hide AXIS_SCROLL constant.""
Hugo Benichi [Wed, 11 Jan 2017 07:23:26 +0000 (16:23 +0900)]
Captive portal: better detect empty responses
The captive portal detection logic treats empty http responses with a
Content-Length of 0 as not coming from a portal.
However when the Content-Length is missing from the response header, the
empty response is not detected as such and is classified as a captive
portal answer.
When this happens for the http probe, the portal detection logic will
short circuit the detection and wrongly report a portal. The system
validates the network in such conditions only if the https probe
returns a successful connection faster than the http probe.
This patch attempts to better detect empty responses by trying to read
the first byte from the response body when the Content-Length is missing
for 200 responses.
Test: build, flashed + manual tests.
Bug:
33498325
(cherry picked from commit
cb4aa4d412c7940386df9b8dd681e0d2efebfd1d)
Change-Id: Ibb9914cba72a4dab3ae76746d8889bbf083be812
Sundeep Ghuman [Mon, 13 Feb 2017 21:13:07 +0000 (13:13 -0800)]
Create TRON events for Wifi Network Recommendations.
We will log which evaluator was used to provide the event,
and whether or not the recommendation resulted in a successful
connection.
Bug:
34384405
Test: NA
Change-Id: I091c4d7f81c5c612248374817cb5c107b6aa20e2
Manu Cornet [Thu, 16 Feb 2017 03:20:17 +0000 (03:20 +0000)]
Merge "DO NOT MERGE - Ensuring that there are per-user last stack active times." into nyc-mr2-dev am:
e0e08f3f41
am:
0c09549ef4 -s ours
Change-Id: I1c45cfdd676e4c58825f3600cc0c3edec199bd59
Manu Cornet [Thu, 16 Feb 2017 03:13:14 +0000 (03:13 +0000)]
Merge "DO NOT MERGE - Ensuring that there are per-user last stack active times." into nyc-mr2-dev
am:
e0e08f3f41
Change-Id: Iaeee64f2a6954be8560412f60f838e2483be01f0
TreeHugger Robot [Thu, 16 Feb 2017 03:02:14 +0000 (03:02 +0000)]
Merge "DO NOT MERGE - Ensuring that there are per-user last stack active times." into nyc-mr2-dev
TreeHugger Robot [Thu, 16 Feb 2017 02:58:50 +0000 (02:58 +0000)]
Merge "Define a new config key for the recommendation provider app."
Hassan Shojania [Tue, 7 Feb 2017 05:09:42 +0000 (21:09 -0800)]
Modular DRM for MediaPlayer
Bug:
34559906
Test: Manual through the test app
Change-Id: I1b1ca61e74f250d63ff5ff462905facb81fe44e0
TreeHugger Robot [Thu, 16 Feb 2017 02:28:18 +0000 (02:28 +0000)]
Merge changes Ia33ab1ab,I1d01ab5d
* changes:
AOD: Add toggle for waking up instead of ambient display on sensors
AOD: Refactor DozeMachine to allow waking up
TreeHugger Robot [Thu, 16 Feb 2017 02:22:59 +0000 (02:22 +0000)]
Merge "Removing PiP from SysUI tuner."
Felipe Leme [Thu, 16 Feb 2017 02:17:12 +0000 (18:17 -0800)]
Pass FillResponse extra back to onSaveRequest(...).
BUG:
33197203
Test: CtsAutoFillServiceTestCases passes
Change-Id: Ibb57b07c7287527acc4c92607de044e789f09dcc
Felipe Leme [Wed, 15 Feb 2017 20:55:11 +0000 (12:55 -0800)]
Add URL on ViewStructure.
The URL will be typically used by views rendering HTML pages (like WebView),
and used in 2 cases
- Root node (containing the URL of the HTML page)
- Child nodes that represent hyperlinks (contains the hyperlink URL).
Fixes:
20902429
Test: manual verification
Test: android.assist.cts.WebViewTest verifies it
Change-Id: Ic49472f1fca89047369b7187176f54efd277e204