233142 Commits

Author SHA1 Message Date
Wale Ogunwale
ea3aa1bc56 Merge "Protect against surfaceController and hasSurface getting out of sync." into nyc-dev 2016-02-18 22:13:06 +00:00
Adam Lesinski
f2d95f71ad DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle am: 1559fed4c4 -s ours am: 5c9378f310 -s ours
am: d828c95a93  -s ours

* commit 'd828c95a930c6789f6251bc8a120bf2293a3a22e':
  DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle
2016-02-18 22:12:23 +00:00
Adam Lesinski
cc869a9fac DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for first time would cause crash am: 2bd90c6abc -s ours am: bca4317a3b -s ours
am: f2fd47bfa5  -s ours

* commit 'f2fd47bfa5533bb9e57b37760edde71776048c88':
  DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for first time would cause crash
2016-02-18 22:09:57 +00:00
Adam Lesinski
cfd49456ec Merge branch 'nyc-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev 2016-02-18 22:08:28 +00:00
Adam Lesinski
fe4db337b3 DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover time am: 9c7b543325 -s ours am: 7e03454985 -s ours
am: 78a2522c7f  -s ours

* commit '78a2522c7f02570f36a3683a9ba5cfa813abc26e':
  DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover time
2016-02-18 22:07:23 +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
Adam Lesinski
d828c95a93 DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle am: 1559fed4c4 -s ours
am: 5c9378f310  -s ours

* commit '5c9378f310acd4ab375ed8a5d703a86522ab814c':
  DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle
2016-02-18 22:03:35 +00: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
Adam Lesinski
f2fd47bfa5 DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for first time would cause crash am: 2bd90c6abc -s ours
am: bca4317a3b  -s ours

* commit 'bca4317a3bbbdfdda083283d73a26e9c078c84f2':
  DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for first time would cause crash
2016-02-18 22:00:55 +00:00
Adam Lesinski
78a2522c7f DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover time am: 9c7b543325 -s ours
am: 7e03454985  -s ours

* commit '7e0345498528611f538d8a5f259acc3440c1a649':
  DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover time
2016-02-18 21:59:39 +00:00
Wale Ogunwale
722ff89fd1 Protect against surfaceController and hasSurface getting out of sync.
WindowStateAnimator.mSurfaceController is set to null whenever a
surface is destroyed and WindowState.mHasSurface is set to false
shortly after that. However, it is possible for them to get out
of sync in a couple of places due to exceptions or duplicate destroy.
Consolidated the call to set WindowState.mHasSurface inside a finally
block in WindowStateAnimator.destroySurface
Also, cleaned up the code a little to that it is more obvious what is
going on.

Bug: 27235356
Change-Id: I7e6d0c1fb015531c393ac86dcaebebd134fad612
2016-02-18 13:57:45 -08: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 3bc623be8dd8b83d0a22c5cc5b5a8955001f6fc7)
2016-02-18 21:51:44 +00:00
Chris Tate
40d8823dd3 Merge "Add android:backupInForeground" into nyc-dev 2016-02-18 21:43:28 +00:00
Chong Zhang
82268228a7 Merge "Use background drawable from the client" into nyc-dev 2016-02-18 21:32:45 +00:00
Chong Zhang
d3fd96c208 Use background drawable from the client
And set the drawable's callback to null during drag-resizing, since
we use multi-threaded renderer, will do not want to schedule draws
to the ViewRootImpl's thread.

bug: 26729953
Change-Id: I6e5f94a5a6ba15edc2d391dd11d8fee3c657d337
(cherry picked from commit 1cc95075e89a0f91cb59ff37a1a027199040c7b4)
2016-02-18 21:20:11 +00:00
Chong Zhang
b9b0fec964 Fix flicker when tapping quickly on dock divider
- Only add preserved surface to removal list when the new surface is shown

- When surface mode change again before the previous preserved surface is
  removed, don't do nothing, instead, destroy the current surface which is
  of wrong size.

  bug: 26545679

Change-Id: Ifd548a0fa9ccdcbc9609ca38bb701cc7256cc6e1
(cherry picked from commit ec63381f7596d89719fd3528b181ed1820a4cb84)
2016-02-18 21:18:31 +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
Makoto Onuki
24f62ea634 Merge "Fix bugs in user restriction migration" into nyc-dev 2016-02-18 20:26:41 +00:00
Makoto Onuki
6094928806 Fix bugs in user restriction migration
Originally I didn't know user-0 could have PO, so I excluded this case
from migration.  Now we handle it properly.

Also make sure only restrictions that can actually be set by each
owner moves to the owner restriction.  (Because of this, we no longer
have to have DISALLOW_WALLPAPER in the exception list, because
owners can't set DISALLOW_WALLPAPER.)

Bug 27225996

Change-Id: I6ad79d90e6c4400abbb1e4feba6ba59e3b650815
2016-02-18 12:09:30 -08:00
Steve McKay
0d198d3afc Merge "Fix CTS failure." into nyc-dev 2016-02-18 20:00:10 +00:00
Steve McKay
b8397607ee Fix CTS failure.
Loosen the reigns on setPickTarget to accommodate no sub command mode.

Change-Id: Ia11c4194970c93fe86e98dfd0d23ed4fa1cea765
2016-02-18 11:59:26 -08: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
Amith Yamasani
4e334cfcd7 Merge "Reduce locking duration when checking idle states" into nyc-dev 2016-02-18 19:24:23 +00:00
Amith Yamasani
b1e153bcd2 Reduce locking duration when checking idle states
Synchronize only the methods that need to be, so that
the lock is not held for a few hundred milliseconds, blocking
other usagestats operations.

Bug: 27208519
Change-Id: I43bda0791dd8b2576a8af506bcdc67a09a5830f2
2016-02-18 11:22:30 -08:00
Jason Monk
26ae3c8063 Merge changes I91733155,If5912504 into nyc-dev
* changes:
  QS header: animation work
  Add TouchAnimator to make QS Animations simpler
2016-02-18 19:21:20 +00:00
Adam Lesinski
5c9378f310 DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle
am: 1559fed4c4  -s ours

* commit '1559fed4c47a4bd219e61f7d34e50d46b8929f8a':
  DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle
2016-02-18 19:20:22 +00:00
Adam Lesinski
bca4317a3b DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for first time would cause crash
am: 2bd90c6abc  -s ours

* commit '2bd90c6abce3e43af6db4eaa7a34459e8341b3a0':
  DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for first time would cause crash
2016-02-18 19:17:39 +00:00
Xiaohui Chen
ea4b6ba420 sysui: refactor for extensibility
Bug: 27100755
Change-Id: I7fff6751b7f197e3e66ab1f87690d556f6e66872
2016-02-18 19:16:57 +00:00
Adam Lesinski
7e03454985 DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover time
am: 9c7b543325  -s ours

* commit '9c7b543325db1a6f8913403ec3a5cbe041b25043':
  DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover time
2016-02-18 19:15:16 +00:00
Simranjit Kohli
62e1f48917 Merge "[Fix extra data in cache]" into nyc-dev 2016-02-18 19:08:34 +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
Jorim Jaggi
d30d95d36c Fix issues with docked icon
- Make sure to update when configuration changes
- Do not reset it to a deprecated icon we don't use
anymore.

Bug: 26451729
Bug: 27045882
Change-Id: I6c23a91fd9577ca836818fcd3ab6a0682880df1f
2016-02-18 18:52:29 +00:00
Jason Monk
ea834eca6e Merge "Tuner volume dnd panel work" into nyc-dev 2016-02-18 18:47:06 +00:00
Jason Monk
aa911b37ae Tuner volume dnd panel work
Change-Id: Id7852e96f987d13c06041e2280d44163a296f49b
2016-02-18 13:39:38 -05:00
Jason Monk
97cb9c77bc QS header: animation work
Bug: 27201532
Change-Id: I917331555132028897821c2a996d1d9dd8ad1833
2016-02-18 13:37:24 -05:00
Jason Monk
794457ae5c Add TouchAnimator to make QS Animations simpler
Bug: 27201532
Change-Id: If5912504748f7b29dd71b70a41bba4ff70b1fc9d
2016-02-18 13:37:05 -05:00
Doris Liu
df7fdb1e0b Revert "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY"""
This reverts commit 0d20a275a5baf8579c8b9111cf2ce6615874a6b6.

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 12abdeb3c7bffbc7c07b913595f6ea2cb66154d1.

Change-Id: I938deddf5f294127f87a0e70f940fe5b9a85e0b2
2016-02-18 18:34:59 +00:00
Diego Perez
16e17a7730 resolve merge conflicts of aa9c9fb29e to nyc-dev
Change-Id: Id46238cb759f2d63a072cb7ea8a27c5fd8a6672e
2016-02-18 18:28:50 +00:00
Erik Kline
bc163f07ee Add Protocol.BASE_ETHERNET
am: ca4c61aa9f

* commit 'ca4c61aa9f7396a167202ea83f4d02f7f62ba482':
  Add Protocol.BASE_ETHERNET
2016-02-18 18:19:06 +00:00
Zachary Kuznia
0bc3cc9c2f Fix crash when cancelling an accessibility gesture with ACTION_UP.
b/27090049

Change-Id: I7a5b65c4e96513539d820c9a2bef99272fb24680
(cherry picked from commit 3951e3547f2ebb5ec228b8776855e9f244b1e9e9)
2016-02-18 17:57:18 +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
Jeff Sharkey
1802664221 Sigh, safe mode.
There are still system internals making assumptions about component
details always being available when requested directly, so relax this
even further to only filter resolve results.

Bug: 27165374
Change-Id: I216fd362516064741e9b80636b99e2d0477d4a58
2016-02-18 10:51:46 -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
Makoto Onuki
aafff2f835 Merge "Ensure DO/PO are also DA." into nyc-dev 2016-02-18 16:57:42 +00:00
Julia Reynolds
c1ea64ced5 Merge "Get applicationinfo as user." into nyc-dev 2016-02-18 15:44:13 +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
Jason Monk
5cac50c3c6 Merge "Remove lights out views from nav bar" into nyc-dev 2016-02-18 15:11:01 +00:00