313629 Commits

Author SHA1 Message Date
Junda Liu
c86e5802c6 Merge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key."
am: ded8a6b7f6

Change-Id: I12f28266088cd9565d62097477c69dcb5ece54e2
2017-04-06 18:25:10 +00:00
Jason Monk
ab98962251 Merge "Ignore a broken test until it can be fixed." into oc-dev
am: eb93670383

Change-Id: Ie8b63c5dcdf7461a2a5d3baf12c400ec73ea3fb8
2017-04-06 18:24:54 +00:00
Junda Liu
ded8a6b7f6 Merge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key." 2017-04-06 18:17:41 +00:00
Scott Randolph
b7190e18bf Merge "Use explicit .c_str() for hidl_string" into oc-dev
am: 0576064b00

Change-Id: I6fe3aef2e5c18e8bcc9fb03b4800fc7f8d9c66ab
2017-04-06 18:13:56 +00:00
Philip P. Moltmann
336531523a Do not show UI when currentID changed.
Test: autofill cts tests (no new failures)
Fixes: 36992897
Change-Id: I0c97a84c034533d07544eb3845ff52cdab107f2a
2017-04-06 11:11:50 -07:00
Kang Li
38a6da6473 Add a service to rank apps for ResolverActivity.
bug: 36952725,30982298

Test: used PTP before and after this fix.

Change-Id: I5b249af2dd0d9fe32d1e524e8d2675c863e92b5b
2017-04-06 18:08:14 +00:00
Rob Carr
1f3a56ef7e Merge "WindowManager.LayoutParams: Expose privateFlags for CTS" into oc-dev
am: 0b504559ee

Change-Id: I784b58f59acf7ed91e37d70e57c076734814aa9e
2017-04-06 18:07:50 +00:00
Santos Cordon
da90bd1fc7 Revert "Remove SystemProperty gating-flag for virtual displays."
Test team is still relying on this.  We'll keep this until the virtual display input code goes in this week.

This reverts commit abcc8e54f636bd4eaff5f85d54d5ff8b75508bb9.

Change-Id: Ic591f813289191b09367a76be3221183562256a7
2017-04-06 18:06:31 +00:00
Rob Carr
acad5c5d4a Merge "Correct animation glitch for pinned stack." into oc-dev
am: 99b72250c2

Change-Id: I63652fee54ab90ae855b4a61b745c087f332fb05
2017-04-06 18:05:41 +00:00
TreeHugger Robot
eb93670383 Merge "Ignore a broken test until it can be fixed." into oc-dev 2017-04-06 18:05:00 +00:00
Scott Randolph
0576064b00 Merge "Use explicit .c_str() for hidl_string" into oc-dev 2017-04-06 18:01:46 +00:00
Rob Carr
0b504559ee Merge "WindowManager.LayoutParams: Expose privateFlags for CTS" into oc-dev 2017-04-06 18:00:55 +00:00
Romain Guy
7c98f5da3d Fix HardwareBitmapTests.testBitmapConfigFromRGB565
Bug: 37077304
Test: HardwareBitmapTests.testBitmapConfigFromRGB565
Change-Id: I987eeab243f93f9ee8fe8d1b6a12ddbd23225651
2017-04-06 11:00:21 -07:00
Rob Carr
99b72250c2 Merge "Correct animation glitch for pinned stack." into oc-dev 2017-04-06 18:00:21 +00:00
Andrii Kulian
eafd9db682 Add system config to specify Multi-Display support
Added config_supportsMultiDisplay. Devices that have the config set
to false will not allow launching activities on secondary screens.

Bug: 36776777
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testMultiDisplayDisabled
Change-Id: Iebb79044440866b1693897b0b53ccb987b5fd8e0
2017-04-06 10:58:32 -07:00
Jeff Tinker
4b1a00ed84 Merge "Fix StringDef usage in MediaDrm API" into oc-dev
am: d2b1f3812c

Change-Id: Ide47e76bd45fe1f50588b4d2fc3f124196ec9769
2017-04-06 17:56:30 +00:00
TreeHugger Robot
d2b1f3812c Merge "Fix StringDef usage in MediaDrm API" into oc-dev 2017-04-06 17:50:27 +00:00
Sudheer Shanka
b0d3b3a5d9 Merge "Don't populate a setting instead of defaulting to 0 when not set." into oc-dev
am: cfeb32287a

Change-Id: I98bfb5020b27db6c3672f30fa0266c5397651a5e
2017-04-06 17:49:36 +00:00
Sudheer Shanka
cfeb32287a Merge "Don't populate a setting instead of defaulting to 0 when not set." into oc-dev 2017-04-06 17:40:58 +00:00
Todd Kennedy
c33cbb21e8 change how instant app installer is updated
. only pay attention to package changes if there's no
  installer or the changed package is the installer
. always update the installer component, even if the
  resolved component is identical [the install paths
  might have updated]

Change-Id: I16eba07ccdb55f5cb61ba6172e71ce1698445fa5
Fixes: 36740490
Test: Manually install/remove/update the installer and see that the component is updated
2017-04-06 10:40:22 -07:00
Felipe Leme
c7ed8c395b Shows a Toast when manual autofill request cannot be fulfilled.
Bug: 35708229
Test: manual verification
Change-Id: If4fa6556dd94a805727329f0aebc4b37f548b3a1
2017-04-06 10:39:44 -07:00
Svetoslav Ganov
a1dfc0f975 Make sure pending cookie persistence canceled
am: 8aa379e0eb

Change-Id: I84d1f385a85a4ca767b2dfa57b389f86e7b6d9fa
2017-04-06 17:34:54 +00:00
Wale Ogunwale
71735d38b1 Preserve app window when it requests a relaunch
Help allow blank screens when the app calls Activity.recreate().

Test: Take YouTube app in-out of split-screen and make sure there is't
      a hole
Fixes 36567223

Change-Id: Ic4915153c2cb88cce9a1bea7500cf89be14c5aa4
2017-04-06 17:31:01 +00:00
Svetoslav Ganov
8aa379e0eb Make sure pending cookie persistence canceled
When a full app is uninstalled we delete its instant app
cookie but were not canceling a pending write which ended
up having the written cookie file after the app is uninstalled.

Test: InstantCookieHostTest#testCookieResetOnNonInstantReinstall

bug:36455310

Change-Id: Iec6d1f95f8ff731885241913808daf12ce3a5587
2017-04-06 17:28:23 +00:00
Jakub Pawlowski
010cc95583 Bluetooth 5 fix default AdvertisingSetParameters values
Having advertiser be scannable and connectable by default is a bad
choice for new advertising set.

Bug: 30622771
Test: sl4a Bt5ScanTest
Change-Id: I4fc270e78ca4e62d3077c5cd28aa59b0518d2e77
2017-04-06 17:21:28 +00:00
Calin Juravle
72bb1c61c5 Check for a null packageInfo before notifying about app install
Test: device boots (wasn't able to repro the race)
Bug: 36642664
Change-Id: Ibab3109a8605c2ff8555d3308cb96389e480cc84
2017-04-06 10:18:39 -07:00
Chad Brubaker
19f98d9707 Expose ConfigUpdater Intents in SystemApi
The Intents are are in the android namespace and should have been
exposed as SystemApi, but were not previously.

Since there are no classes in the framework that reference these Intents
this adds android.os.ConfigUpdate to have them all in one place.

Test: builds
Change-Id: I2086945301f06b28b491ec876652c37e97315e8c
Fixes: 35252508
Fixes: 35266806
Fixes: 35266833
Fixes: 35271111
(cherry picked from commit 987b0fc4a57c8b8246b12069a5db06693bc3eea6)
2017-04-06 17:18:13 +00:00
Nathan Harold
5601e8836a Merge changes from topic 'ipsec-merge-conflicts' into oc-dev-plus-aosp
* changes:
  Fix Log Traces for IpSecService
  SystemServer: fix StartIpSecService trace and log
2017-04-06 17:17:20 +00:00
Julia Reynolds
9dbed5d11e Merge "Fix build" into oc-dev
am: 0b47e289c8

Change-Id: Ic1c373a21b2c38cdc6a3c3491bb3080367401519
2017-04-06 17:01:18 +00:00
Chad Brubaker
57a9464831 Merge "Allow permissions to be runtime-only." into oc-dev
am: 941e9e2b38

Change-Id: I2b1b3a53e6609cc335b4efa9084e603986f58bbe
2017-04-06 16:54:50 +00:00
Julia Reynolds
0b47e289c8 Merge "Fix build" into oc-dev 2017-04-06 16:45:09 +00:00
Todd Kennedy
f97938f9d0 Merge "Bind with the correct action" into oc-dev
am: e7ec7ec634

Change-Id: I761c5e112a75aa7314821f36c932e98b90be1aec
2017-04-06 16:44:58 +00:00
Chad Brubaker
941e9e2b38 Merge "Allow permissions to be runtime-only." into oc-dev 2017-04-06 16:44:11 +00:00
Felipe Leme
6219f2693e Fixed Autofill NPE that crashed some apps.
It happened when views provided an Accessibility node that had children.

Bug: 37078783
Fixes: 37009008
Test: LoginActivityTest#testAutoFillWhenViewHasChildAccessibilityNodes

Change-Id: Ie694094afe9129b933096a385eb867baf4550e7f
2017-04-06 09:44:04 -07:00
Calin Juravle
13dcd27fb5 Reconcile secondary dex paths when compiling with adb shell cmd...
Test: running `adb shell cmd package compile -r bg-dexopt -f  --secondary-dex com.google.android.gms` prints no error for missing dex files.

Bug: 36895499
Change-Id: Ibde3d47121dcb2c252fe29772d8db81ea599b2d0
2017-04-06 09:43:20 -07:00
Julia Reynolds
4740b61553 Fix build
Test: runtest systemui
Change-Id: I94663b45c8f745c9485cdeb898de5a6bc4f85f0b
2017-04-06 16:41:45 +00:00
Winson Chung
f1bfee1ca2 Disable PiP when VR mode starts.
Bug: 36214284
Test: Ensure that PiP is stopped when VR is enabled.
Change-Id: Ib537e1f360be7b47199d230e5691f6fece0f925f
2017-04-06 09:37:59 -07:00
Ruben Brunk
279d34af31 Refactor VR state management in ActivityManagerService.
- Move VR-related state from ActivityManagerService into
  VrController.
- Move VR-related render thread scheduling logic from
  ActivityManagerService into VrController.
- Update state logic to better enforce invariants.

Bug: 36214284

Test: Covered by existing tests.
Change-Id: I02d1488da0c0f65a10dd0369f38f1a0c47cee174
2017-04-06 09:36:56 -07:00
TreeHugger Robot
e7ec7ec634 Merge "Bind with the correct action" into oc-dev 2017-04-06 16:35:37 +00:00
Steven Moreland
f8202e464e Use hwservicemanager getTransport.
libhidl no longer provides a getTransport function. Now, call into the
hwservicemanager which directly interfaces with libvintf.

Test: extensive, see Ia5d1eb41b057ab5d6800f6c3fd22658adecc4be7
Bug: 36377072
Change-Id: I8b0ca845251cd7cd156f3471cbd4b0ce17617be0
2017-04-06 09:29:58 -07:00
Julia Reynolds
fafcda882b Merge "Show a link to app settings in notification guts." into oc-dev
am: 0ff1b458ac

Change-Id: I27b70e04b9924c95dbd2f915d27c0e346f2f0a09
2017-04-06 16:06:09 +00:00
Calin Juravle
50d47492f1 Merge "Keep track of protected data dirs in DexManager" into oc-dev
am: 539128f6d6

Change-Id: I8eb1a7e5300fff4861387a82ce9d47afb1764946
2017-04-06 16:03:41 +00:00
Julia Reynolds
0ff1b458ac Merge "Show a link to app settings in notification guts." into oc-dev 2017-04-06 15:55:36 +00:00
Calin Juravle
539128f6d6 Merge "Keep track of protected data dirs in DexManager" into oc-dev 2017-04-06 15:55:04 +00:00
Colin Cross
8a7b3ce32a Merge "Update layoutlib to match java library changes" am: ac6414524c am: 72ae1a8958
am: a989576027

Change-Id: Ib1317327abce727809750ff9a82882e27ce24c66
2017-04-06 15:53:37 +00:00
Colin Cross
a989576027 Merge "Update layoutlib to match java library changes" am: ac6414524c
am: 72ae1a8958

Change-Id: I729b6f1c3e8d35ee7710f7d34c1e2563a5a198c3
2017-04-06 15:46:30 +00:00
Conrad Chen
1f6d4b5c81 Add intent to intialize programs on APP installed
Adds a new broadcast intent for system APPs to send when some TV APP met
certain requirements is newly installed. The intent will wake up the APP
and notify it to initialize its channel and program list to the system
provider.

Test: build
Bug: 34739955
Change-Id: Ib172b40434db4a439ec0db7bf8b28037d0bfb8a8
2017-04-06 08:42:59 -07:00
Colin Cross
72ae1a8958 Merge "Update layoutlib to match java library changes"
am: ac6414524c

Change-Id: If673886a433d1c02ac19646ab8128ad1b36280c8
2017-04-06 15:38:45 +00:00
Jason Monk
1ee48434ef Ignore a broken test until it can be fixed.
Test: runtest systemui
Bug: 37074875
Change-Id: Id5561a3ded2242c711c2edccefb1647437d6f963
2017-04-06 11:31:19 -04:00
Colin Cross
ac6414524c Merge "Update layoutlib to match java library changes" 2017-04-06 15:30:45 +00:00