Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
233,634 Commits 3 Branches 0 Tags
3825dcd7548fb4e5d7bcbc3c688a5c282cadc6e4
Commit Graph

55700 Commits

Author SHA1 Message Date
Jeff Sharkey
3825dcd754 Merge "Make BackupManager encryption aware." into nyc-dev 
am: 003ee19851

* commit '003ee198518490c9572e610ddc21e8b3a024364c':
  Make BackupManager encryption aware.
 2016-02-18 20:52:48 +00:00
Jeff Sharkey
003ee19851 Merge "Make BackupManager encryption aware." into nyc-dev 2016-02-18 19:26:36 +00:00
Doris Liu
e98f28aad1 Merge "Revert "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY"""" into nyc-dev 
am: 5b7188aebc

* commit '5b7188aebc2401c9c010543eff62ef53036c147b':
  Revert "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY"""
 2016-02-18 19:23:23 +00:00
Doris Liu
c5c59024d1 Merge "Revert "Check RenderNode\'s owning view before attaching animators"" into nyc-dev 
am: b9fb8fdf78

* commit 'b9fb8fdf78ba3369da1fc89932bb8253b9183620':
  Revert "Check RenderNode's owning view before attaching animators"
 2016-02-18 19:20:26 +00:00
Doris Liu
5b7188aebc Merge "Revert "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY"""" into nyc-dev 2016-02-18 19:06:20 +00:00
Doris Liu
b9fb8fdf78 Merge "Revert "Check RenderNode's owning view before attaching animators"" into nyc-dev 2016-02-18 19:04:28 +00:00
Vladislav Kaznacheev
ea2ff3ca41 Merge "Do not call IWindowSession.updatePointer icon from pointer handler" into nyc-dev 
am: 7549a9a8f2

* commit '7549a9a8f2934635ccc58161ebc526c994d7ab58':
  Do not call IWindowSession.updatePointer icon from pointer handler
 2016-02-18 18:54:15 +00:00
Julia Reynolds
3c2ed58ff0 Merge "Inflate and strip remote views for pre-N apps." into nyc-dev 
am: 4bb2de2557

* commit '4bb2de255733d48cbb21587fa4ab0eb4eacee943':
  Inflate and strip remote views for pre-N apps.
 2016-02-18 18:40:09 +00:00
Doris Liu
df7fdb1e0b Revert "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY""" 
This reverts commit 0d20a275a5.

Change-Id: I97c782f1164a5d39ab74dc098cca71d9e1b30cd8
 2016-02-18 18:37:02 +00:00
Doris Liu
eb40178af3 Revert "Check RenderNode's owning view before attaching animators" 
This reverts commit 12abdeb3c7.

Change-Id: I938deddf5f294127f87a0e70f940fe5b9a85e0b2
 2016-02-18 18:34:59 +00:00
Sudheer Shanka
19e2adac15 Merge "Update ACTION_SHOW_ADMIN_SUPPORT_DETAILS action to be hidden." into nyc-dev 
am: af9c30aa74

* commit 'af9c30aa741b0b385840ffcd60040d8524b95f89':
  Update ACTION_SHOW_ADMIN_SUPPORT_DETAILS action to be hidden.
 2016-02-18 18:34:39 +00:00
Shawn Willden
b838736b6e Merge "Add support for extending key validity while on body." into nyc-dev 
am: 0f900c02d9

* commit '0f900c02d9aafa9a98ff39ea7d661c1cdfbddcdb':
  Add support for extending key validity while on body.
 2016-02-18 18:30:59 +00:00
Jeff Sharkey
2c1ba9a961 Make BackupManager encryption aware. 
Backup requires both CE and DE storage to be available, so delay
spinning up the backup system until the user is unlocked, since
that's when CE storage becomes available.  Note that devices without
FBE immediately transition USER_SYSTEM into the unlocked state,
since their CE is always available.

Offer to backup and restore files under both CE and DE.  Since DE
is effectively the same as CE, most logic is simply duplicated for
now, but it could be simplified in the future.  Since system apps
can force their default storage location to DE, we always build
explicit CE and DE paths.

Add getDataDir() to give clean access to the top-level private data
directory, but disclaim that apps shouldn't create files there.

Bug: 26279618
Change-Id: Ic34a4b330223725db93b1d0f5c9dffc88002c61f
 2016-02-18 10:54:11 -07:00
Vladislav Kaznacheev
7549a9a8f2 Merge "Do not call IWindowSession.updatePointer icon from pointer handler" into nyc-dev 2016-02-18 17:43:39 +00:00
Julia Reynolds
4bb2de2557 Merge "Inflate and strip remote views for pre-N apps." into nyc-dev 2016-02-18 15:18:11 +00:00
Sudheer Shanka
af9c30aa74 Merge "Update ACTION_SHOW_ADMIN_SUPPORT_DETAILS action to be hidden." into nyc-dev 2016-02-18 13:58:05 +00:00
Julia Reynolds
d4ea741d66 Inflate and strip remote views for pre-N apps. 
Bug: 27120291
Change-Id: I4e1497222f3787e68c3e385e45ab6a7c23799917
 2016-02-18 08:35:45 -05:00
Shawn Willden
0f900c02d9 Merge "Add support for extending key validity while on body." into nyc-dev 2016-02-18 12:51:50 +00:00
Shawn Willden
adef49640d Add support for extending key validity while on body. 
Bug: 21563854
Change-Id: I3b622d2af77ec4ac3ba42407fc391112c153ef0f
 2016-02-18 05:50:21 -07:00
Sudheer Shanka
aebd5dd786 Update ACTION_SHOW_ADMIN_SUPPORT_DETAILS action to be hidden. 
Bug: 27225657
Change-Id: I85ad8bf88845e9164011b303ec9ca90d993fc20e
 2016-02-18 12:39:57 +00:00
Erik Kline
9a927da7cf {,Base}DhcpStateMachine is no more am: efa4209fe0 
am: 7651b21fe9

* commit '7651b21fe94dc081276a7bbff72f8c37a70f1b94':
  {,Base}DhcpStateMachine is no more
 2016-02-18 04:42:58 +00:00
Erik Kline
7651b21fe9 {,Base}DhcpStateMachine is no more 
am: efa4209fe0

* commit 'efa4209fe022d007f48edc3c4feaef00a9865cb5':
  {,Base}DhcpStateMachine is no more
 2016-02-18 04:38:38 +00:00
Erik Kline
efa4209fe0 {,Base}DhcpStateMachine is no more 
Bug: 26991160
Change-Id: I21f8c30627bf2a7fbcd5b4d5f1f1ad1a2dda759b
 2016-02-18 12:56:45 +09:00
Deepanshu Gupta
89237f4b7f Merge "LayoutLib fixes for N" into nyc-dev 
am: f0c5b7af6f

* commit 'f0c5b7af6f062e6e064af22ee58e9eb6b549a6ce':
  LayoutLib fixes for N
 2016-02-18 03:28:35 +00:00
Deepanshu Gupta
491523d52c LayoutLib fixes for N 
Moves LayoutLib to Java 8 - YAY!
Fix delegates

Change-Id: I098996e43e330e995d33f12df1c16355bbc02f0f
 2016-02-18 02:10:24 +00:00
Alex Klyubin
74d5138dc2 Merge "Use production ID for v2 signing scheme." into nyc-dev 
am: be8c223c24

* commit 'be8c223c2459be17f7ee8a5f078b11a34fd1b7ca':
  Use production ID for v2 signing scheme.
 2016-02-18 02:07:59 +00:00
Alex Klyubin
be8c223c24 Merge "Use production ID for v2 signing scheme." into nyc-dev 2016-02-18 02:03:48 +00:00
Vladislav Kaznacheev
527905e195 Do not call IWindowSession.updatePointer icon from pointer handler 
Currently if View.setPointerIcon is called from inside a pointer
event handler this will cause a redundant round-trip to the server
which can be easily avoided.

Bug: 27107871
Change-Id: Ia641818c3700c0d96d0c32e020b91af58dccfa2a
 2016-02-17 16:51:05 -08:00
Winson
07801468b2 Only set the task description if the colors are opaque. 
am: 2d47683ab9

* commit '2d47683ab969a1da30209e44712ce6513e324b89':
  Only set the task description if the colors are opaque.
 2016-02-18 00:18:06 +00:00
Felipe Leme
e14f8583c5 Merge "Fixed typo on Storage Access Framework." into nyc-dev 
am: 79c11a8c55

* commit '79c11a8c550090436fed7ad540b5d5d20e1faeb2':
  Fixed typo on Storage Access Framework.
 2016-02-17 23:53:07 +00:00
Makoto Onuki
d55874a6e2 Merge "[framework] Don\'t allow apps on external storage to be active admin" into nyc-dev 
am: fc482c30b7

* commit 'fc482c30b7a3c2cf7bc14d5c86de758a16f6433d':
  [framework] Don't allow apps on external storage to be active admin
 2016-02-17 23:51:15 +00:00
Felipe Leme
ac6f61dd27 Merge "Removed Intent.OPEN_EXTERNAL_DIRECTORY." into nyc-dev 
am: 014a0d11c7

* commit '014a0d11c7ac521b77c62278d31ce4d41c5f33b7':
  Removed Intent.OPEN_EXTERNAL_DIRECTORY.
 2016-02-17 23:49:22 +00:00
Felipe Leme
f3fb06dd3d Merge "Initial implementation of StorageManager.getVolumesList()." into nyc-dev 
am: 3c3770d8fe

* commit '3c3770d8fe9f64fc92de02f3e52901748e1f30de':
  Initial implementation of StorageManager.getVolumesList().
 2016-02-17 23:47:27 +00:00
Winson
2d47683ab9 Only set the task description if the colors are opaque. 
Bug: 27214638
Change-Id: I75e0b8871087f0b8e6acd16dc751bb6374c0f968
 2016-02-17 23:23:45 +00:00
Felipe Leme
79c11a8c55 Merge "Fixed typo on Storage Access Framework." into nyc-dev 2016-02-17 22:51:02 +00:00
Makoto Onuki
fc482c30b7 Merge "[framework] Don't allow apps on external storage to be active admin" into nyc-dev 2016-02-17 22:48:13 +00:00
Felipe Leme
53fcc756d0 Fixed typo on Storage Access Framework. 
BUG: 26742218
Change-Id: I9b695ebe2176f186fc63b20f624e40dd9e257bc3
 2016-02-17 14:45:52 -08:00
Felipe Leme
014a0d11c7 Merge "Removed Intent.OPEN_EXTERNAL_DIRECTORY." into nyc-dev 2016-02-17 22:43:20 +00:00
Felipe Leme
3c3770d8fe Merge "Initial implementation of StorageManager.getVolumesList()." into nyc-dev 2016-02-17 22:42:40 +00:00
Felipe Leme
34a9d52719 Removed Intent.OPEN_EXTERNAL_DIRECTORY. 
Such intent is now encapsulated by StorageVolume.createAccessIntent().

BUG: 26742218

Change-Id: I2e2bd71126ecd74981f77b0af7d069f51aaece74
 2016-02-17 14:38:25 -08:00
Chad Brubaker
834038747d Merge "Fix getAcceptedIssuers" into nyc-dev 
am: da449afbfe

* commit 'da449afbfeac5d9d20e94d4c34e4d00b18b4b017':
  Fix getAcceptedIssuers
 2016-02-17 22:28:18 +00:00
Makoto Onuki
f34db0a17e [framework] Don't allow apps on external storage to be active admin 
Bug 27149287

Change-Id: I6d959d2e66dc0b19f78e6135fbdcf45ca8551958
 2016-02-17 14:24:25 -08:00
Chad Brubaker
da449afbfe Merge "Fix getAcceptedIssuers" into nyc-dev 2016-02-17 22:20:36 +00:00
Amith Yamasani
4dcb319701 Merge "Clean up App Standby code" into nyc-dev 
am: 0137c3daf4

* commit '0137c3daf4bdd3154b71d9b34536960c424fc422':
  Clean up App Standby code
 2016-02-17 22:01:27 +00:00
Amith Yamasani
0137c3daf4 Merge "Clean up App Standby code" into nyc-dev 2016-02-17 21:50:32 +00:00
Amith Yamasani
ca5d6d2a81 Clean up App Standby code 
Don't continue to check idle states for removed / stopped users.
No need to check for uninstalled packages for all users.

Bug: 27208519
Change-Id: I9a3a3bbec560dd380ce90df9fef102d7f62769ca
 2016-02-17 13:36:48 -08:00
Tony Mak
cc5bd97810 Merge "[ContactsContract] Add new API PhoneLookup.CONTACT_ID and DATA_ID" into nyc-dev 
am: 181d907d24

* commit '181d907d2416dcf780640f3c3fb13623acc187a1':
  [ContactsContract] Add new API PhoneLookup.CONTACT_ID and DATA_ID
 2016-02-17 21:25:27 +00:00
Jorim Jaggi
ab3e290fe2 Make sure we call reportResized exactly once when drag starting 
am: c662d8e946

* commit 'c662d8e94620c84b2fa57bfd6e45690f0c349d89':
  Make sure we call reportResized exactly once when drag starting
 2016-02-17 21:18:23 +00:00
Felipe Leme
04a5d40cf3 Initial implementation of StorageManager.getVolumesList(). 
This change makes StorageManager.getVolumesList(),
StorageManager.getPrimaryVolume(),  and StorageVolume public and adds a
buildAccessIntent() in the latter to automatically generate the
ACTION_OPEN_EXTERNAL_DIRECTORY intent, but it doesn't change the
ACTION_OPEN_EXTERNAL_DIRECTORY implementation yet (i.e., it still takes an URI with the physical path of the directory, instead of a StorageVolume and
a directorny name).

BUG: 26742218

Change-Id: I36c59c42b6579e125ec7f03c3af141260875a491
 2016-02-17 13:14:39 -08:00
Tony Mak
fd9ec5a600 [ContactsContract] Add new API PhoneLookup.CONTACT_ID and DATA_ID 
It is a mistake that we put contact id in PhoneLookup._ID.
But for SIP query, the contact id is put in Data.CONTACT_ID instead.
For backward-compability issue, we can't revert the change, but to
save developer from having logic like below, PhoneLookup.CONTACT_ID is
introduced.

if (sip) {
    get contact id in Data.CONTACT_ID column
} else {
    get contact id in PhoneLookup._ID column
}

So for sip query, we put contact id in PhoneLookup.CONTACT_ID.
For other phone lookup query, we put contact id in both PhoneLookup.ID
and PhoneLookup.CONTACT_ID.

BUG:27149017

Change-Id: I4155da29bbacdda0d43164b0ce11c7224a4eee67
 2016-02-17 21:08:09 +00:00