drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
313,485 Commits 1 Branch 0 Tags
Commit Graph

313485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kang Li
461959d71f Merge "Add a service to rank apps for ResolverActivity." into oc-dev 
am: 5a0ee44ce5

Change-Id: I36f8664480f8741dd4d755cfcc3cfa95d8e3d1ba
 2017-04-06 20:37:09 +00:00
Santos Cordon
cc63fe5a0b Merge "Revert "Remove SystemProperty gating-flag for virtual displays."" into oc-dev 
am: 849302c0f1

Change-Id: I5eea2d35eec58ada02756f060374d2940198cbe1
 2017-04-06 20:30:08 +00:00
TreeHugger Robot
5a0ee44ce5 Merge "Add a service to rank apps for ResolverActivity." into oc-dev 2017-04-06 20:25:47 +00:00
Winson Chung
dc40c45d5b Merge "Disable PiP when VR mode starts." into oc-dev 
am: d82c58abc5

Change-Id: I41849e0a00644592fd1e9d0a89a337a5a0a002fa
 2017-04-06 20:21:58 +00:00
Jason Monk
79f56babd7 Merge "Revert "Handle case when snapshot dimensions don't match"" into oc-dev 
am: e7ac324c71

Change-Id: If7e422b1a5e7f8b94d4f338412025aa7ca526a09
 2017-04-06 20:20:41 +00:00
TreeHugger Robot
849302c0f1 Merge "Revert "Remove SystemProperty gating-flag for virtual displays."" into oc-dev 2017-04-06 20:17:55 +00:00
Matt Sarett
fd5d5425ee Merge "Xform bitmaps to sRGB on SW and PDF canvases" into oc-dev 
am: c29dffed16

Change-Id: I5a62876593d2e4423758bce57c8b82e9bdb3864c
 2017-04-06 20:16:19 +00:00
Ruben Brunk
93a6f233e6 Merge "Refactor VR state management in ActivityManagerService." into oc-dev 
am: e002ce70e3

Change-Id: Id619a22930c52ac82c8526c2a215ee6499320720
 2017-04-06 20:11:17 +00:00
Philip P. Moltmann
053c940806 Merge "Do not show UI when currentID changed." into oc-dev 
am: ff5eb06e3d

Change-Id: I024dc7344a2c6074f50e06aef6bfb95664d13495
 2017-04-06 20:10:13 +00:00
Chad Brubaker
878331631e Merge "Expose ConfigUpdater Intents in SystemApi" into oc-dev 
am: 6de4ea56f7

Change-Id: Ibdf483d6b40ac30f78e3e6e4a024c7da2354831d
 2017-04-06 20:09:06 +00:00
Todd Kennedy
573d7a08a8 Merge "change how instant app installer is updated" into oc-dev 
am: 5b36b4db64

Change-Id: Ib870f9783e9462da0837f55ac8a39379c701963a
 2017-04-06 20:08:04 +00:00
Sudheer Shanka
604aa86034 Merge "ConnectivityService: safer locking" into oc-dev 
am: 6120db5990

Change-Id: I1c22edc7a247d83d860e7016fe7edab1537c5bb7
 2017-04-06 20:07:00 +00:00
Felipe Leme
eefb3c91f1 Merge "Fixed Autofill NPE that crashed some apps." into oc-dev 
am: 75d0d92f7b

Change-Id: I0a0b70b0a6e476b038af6e58fa524eadd3856de2
 2017-04-06 20:04:53 +00:00
TreeHugger Robot
d82c58abc5 Merge "Disable PiP when VR mode starts." into oc-dev 2017-04-06 19:59:57 +00:00
Jason Monk
e7ac324c71 Merge "Revert "Handle case when snapshot dimensions don't match"" into oc-dev 2017-04-06 19:51:12 +00:00
TreeHugger Robot
c29dffed16 Merge "Xform bitmaps to sRGB on SW and PDF canvases" into oc-dev 2017-04-06 19:48:47 +00:00
TreeHugger Robot
e002ce70e3 Merge "Refactor VR state management in ActivityManagerService." into oc-dev 2017-04-06 19:47:33 +00:00
Philip P. Moltmann
ff5eb06e3d Merge "Do not show UI when currentID changed." into oc-dev 2017-04-06 19:40:48 +00:00
TreeHugger Robot
6de4ea56f7 Merge "Expose ConfigUpdater Intents in SystemApi" into oc-dev 2017-04-06 19:40:25 +00:00
TreeHugger Robot
5b36b4db64 Merge "change how instant app installer is updated" into oc-dev 2017-04-06 19:39:04 +00:00
Sudheer Shanka
6120db5990 Merge "ConnectivityService: safer locking" into oc-dev 2017-04-06 19:37:17 +00:00
Felipe Leme
75d0d92f7b Merge "Fixed Autofill NPE that crashed some apps." into oc-dev 2017-04-06 19:36:26 +00:00
Hugo Benichi
0fd4af9ebf ConnectivityService: safer locking 
This path changes a dangerous lock path in reportNetworkConnectivity().
This methods is called outside of the main ConnectivityService handler
and takes a lock on a specific NetworkAgentInfo whose connectivity
status is being reported.

While this lock is held, reportNetworkConnectivity() goes on and query
the network policy state for that network, which may ends into
NetworkPolicyManagerService.

Instead, the lock on NetworkAgentInfo is only held long enough to make a
copy of LinkProperties, which is then passed to
NetworkPolicyManagerService without that lock.

Bug: 36902662
Test: could not repro b/36902662, reportNetworkConnectivity() works.
      $ runtest frameworks-net

Change-Id: Iac4b75bcecbdddb0ac695c8b1a87ae755f62f47f
 2017-04-06 11:50:09 -07:00
Junda Liu
b99d392425 Merge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key." am: ded8a6b7f6 am: c86e5802c6 
am: efb72ba71c

Change-Id: Ib678a10ef5d4792581c40d8ac15a183604d35ba2
 2017-04-06 18:39:43 +00:00
Junda Liu
efb72ba71c Merge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key." am: ded8a6b7f6 
am: c86e5802c6

Change-Id: I9ea249ed0837c8501f62154bec5c36d47a0e67e0
 2017-04-06 18:32:10 +00:00
Jason Monk
ba53d8ae41 Revert "Handle case when snapshot dimensions don't match" 
This reverts commit aea6b74e17a0f7b105999adad50dd20eac17df35.
Bug: 36991071
Bug: 36703868
Change-Id: Ie71992144e78a6580bfce17dfdf20396af80eacd
 2017-04-06 18:30:11 +00:00
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
Rob Carr
99b72250c2 Merge "Correct animation glitch for pinned stack." into oc-dev 2017-04-06 18:00:21 +00: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
Svetoslav Ganov
a1dfc0f975 Make sure pending cookie persistence canceled 
am: 8aa379e0eb

Change-Id: I84d1f385a85a4ca767b2dfa57b389f86e7b6d9fa
 2017-04-06 17:34:54 +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
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