Commit Graph

55713 Commits

Author SHA1 Message Date
Andreas Gampe
730eef4a82 Merge "Frameworks/base: Use Log.printlns in RuntimeInit" into nyc-dev
am: a2cc0c2ca2

* commit 'a2cc0c2ca282d9b4b8525df37bdb9e9cb0304abc':
  Frameworks/base: Use Log.printlns in RuntimeInit
2016-02-18 22:36:00 +00:00
Andreas Gampe
a2cc0c2ca2 Merge "Frameworks/base: Use Log.printlns in RuntimeInit" into nyc-dev 2016-02-18 22:26:13 +00:00
Adam Lesinski
1720dd8618 Merge branch \'nyc-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev
am: cfd49456ec

* commit 'cfd49456ecd7af35bc808f0e5a6b0ff6db444c25':
  Push mapping of package name to appId to kernel.
2016-02-18 22:16:33 +00:00
Jeff Sharkey
550b38d85b Merge "Push mapping of package name to appId to kernel." into nyc-dev 2016-02-18 22:07:06 +00:00
Andre Eisenbach
b8294d3b8e Read Bluetooth interop database entries from settings (1/2)
am: 82a94d98e7

* commit '82a94d98e74b6ba0f816c675486a0672d473ecf5':
  Read Bluetooth interop database entries from settings (1/2)
2016-02-18 22:02:08 +00:00
Andreas Gampe
d888beb9bf Frameworks/base: Use Log.printlns in RuntimeInit
Make printlns in Log public-@hide so it can be used.

Print uncaught exceptions that will terminate the process in
RuntimeInit using printlns, so that long exception traces are not
being truncated.

Bug: 27245306
Change-Id: Ib24635f0ebdd80bd125e367302cab6a78e6a210a
2016-02-18 14:01:41 -08:00
Jeff Sharkey
2271ba3627 Push mapping of package name to appId to kernel.
The new sdcardfs kernel driver needs to know this mapping for
deriving UID permissions, so push the data through /config when
supported by the kernel.  This also has the nice benefit of letting
us push only the deltas of what actually changes, instead of
re-parsing the entire "packages.list" file.

The mappings for newly installed apps are pushed before the app is
allowed to run, removing some latent race conditions.  Also cleans
up stale mappings when packages are uninstalled, and whenever the
system server reboots.

Bug: 19160983
Change-Id: Iace92efb69616c96b34c0d9d911e4b54e5fd8a67
2016-02-18 15:01:15 -07:00
Chris Tate
eced804d01 Merge "Add android:backupInForeground" into nyc-dev
am: 40d8823dd3

* commit '40d8823dd32a6898198c8680135dea715fbddd51':
  Add android:backupInForeground
2016-02-18 21:52:24 +00:00
Andre Eisenbach
82a94d98e7 Read Bluetooth interop database entries from settings (1/2)
Interop database entries are stored in the system settings entry
"BluetoothInteropDatabase". The format is a list of entries separated by
";". An entry consists of a BDA fragment, followed by a comma and an
integer representing a feature from interop.h.

Example:
To disable LE secure connections for devices starting with BDA 11:22:33,
use "11:22:33,0".

Bug: 26548845
Change-Id: I6a9fd34f6af4d3bdfcaa0e051eafebdfbf2a4949
(cherry picked from commit 3bc623be8d)
2016-02-18 21:51:44 +00:00
Antonio Cansado
7e098af672 Merge "Implementation of data usage callbacks." into nyc-dev
am: 12d7ea815b

* commit '12d7ea815b772b1013f9f5a583d296701a702a0c':
  Implementation of data usage callbacks.
2016-02-18 20:53:58 +00:00
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
Christopher Tate
43fbc5f898 Add android:backupInForeground
An app can now declare that it really needs to be backed up
whenever possible even if it is currently engaged in foreground-
equivalent work.  Only applies to full-data backup clients: key/value
backups are not intrusive on normal lifecycle so they can already
happen in such circumstances.

Bug 26790411

Change-Id: Ia0ebcc7a53da888ae9ae4d63cd4bcab6e3a2e866
2016-02-18 20:47:36 +00:00
Antonio Cansado
12d7ea815b Merge "Implementation of data usage callbacks." into nyc-dev 2016-02-18 19:43:42 +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
Antonio Cansado
cd42acd951 Implementation of data usage callbacks.
NetworkStatsService will register data usage requests
and keep data usage stats scoped to the request.

There are different types of data usage requests
- scoped to a set of NetworkTemplate; these are restrictred to
device owners and carrier apps and allow the caller to monitor
all activity on the specified interfaces.
- scoped to all uids visible to the user, if the user has
android.Manifest.permission#PACKAGE_USAGE_STATS permission.
The set of uids may change over time, so we keep track of that.
- scoped to a set of uids given by the caller, granted that
the caller has access to those uids.
- scoped to the caller's own data usage. This doesn't require
PACKAGE_USAGE_STATS.

Bug: 25812785
Change-Id: Ie11f35fc1f29d0dbe82f7fc924b169bb55c76708
2016-02-17 18:43:53 -08: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