Commit Graph

61075 Commits

Author SHA1 Message Date
Adam Powell
e0967f875e Merge "Fix NPE for Fragment#setUserVisibleHint(true)" into nyc-dev
am: 35c8e0fcf2

* commit '35c8e0fcf2e26f24ac21bb3df87158d4a0f4587f':
  Fix NPE for Fragment#setUserVisibleHint(true)
2016-02-18 23:53:06 +00:00
Adam Powell
35c8e0fcf2 Merge "Fix NPE for Fragment#setUserVisibleHint(true)" into nyc-dev 2016-02-18 23:44:15 +00:00
Yohei Yukawa
46012e0fde Merge "Stop granting default Contacts permission to IMEs." into nyc-dev
am: 5eb148bab6

* commit '5eb148bab6ea49c4c646649692ae6769b9c4e54c':
  Stop granting default Contacts permission to IMEs.
2016-02-18 23:31:33 +00:00
Adam Powell
9ed8767dc1 Merge "Restore auto-launch behavior for ACTION_CHOOSER with a single choice" into nyc-dev
am: cff479e2ee

* commit 'cff479e2eeaedb42765d2522e8befe7efaa67bd6':
  Restore auto-launch behavior for ACTION_CHOOSER with a single choice
2016-02-18 23:20:22 +00:00
Adam Powell
255b008afe Fix NPE for Fragment#setUserVisibleHint(true)
Fix a bug where calling setUserVisibleHint(true) before adding a
Fragment to a FragmentManager could cause a crash.

Bug 27250018

Change-Id: Id192ae31bab95f15d32de9f105e707bdb8691641
2016-02-18 15:17:29 -08:00
Yohei Yukawa
5eb148bab6 Merge "Stop granting default Contacts permission to IMEs." into nyc-dev 2016-02-18 23:16:06 +00:00
Adam Powell
cff479e2ee Merge "Restore auto-launch behavior for ACTION_CHOOSER with a single choice" into nyc-dev 2016-02-18 23:13:39 +00:00
Christopher Tate
15e95000b1 Keyguard wallpaper
am: be132e6ea4

* commit 'be132e6ea494023d4b8c37658a34efa8b705dce9':
  Keyguard wallpaper
2016-02-18 23:10:07 +00:00
Christopher Tate
be132e6ea4 Keyguard wallpaper
Clients can now set a lock-only wallpaper that Keyguard can
observe and choose to draw as appropriate.

Bug 25454162

Change-Id: I3fc30e02919e814b55dfded2a1a36ad9d2e55299
2016-02-18 15:01:02 -08:00
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
Yohei Yukawa
726c45970e Stop granting default Contacts permission to IMEs.
This partially reverts the previous commit [1], which allowed special
components to be granted some pre-configured default permissions.

With this CL, we no longer grant Contacts permissions to pre-installed
IMEs.  Rationals are:

  1. Even without this CL, not the all pre-installed IMEs are granted
     Contacts permission by default, because it was done during the boot
     time where InputMethodManagerService is not yet completely
     initialized.  The current behavior is confusing not only for users
     but also for developers.
  2. In almost all the cases, IMEs are supposed to be able to work
     without Contacts permission.  Hence it is not too late to ask users
     to grant the permission to the IME after the initial setup is
     completed.
  3. It is difficult to add new features such as File-Based Encryption
     (FBE) with keeping the current implementation, because currently we
     dynamically call mSettings.setCurrentUserId(userId) just to
     enumerate what IMEs will be enabled for a given user.  Adding
     another condition (whether the user has already unlocked the device
     or not) would make things more complicated.

Note that LatinIME has already support the case where Contacts
permission is not granted by default.  It does not ask users for
anything until Setup-Wizard is completed, and requests Contacts
permission only when the user taps a message in the suggestion strip
that suggests users to use contacts name for typing suggestions.

 [1] If8b8cadbd1980ffe7a6fc15bbb5f54a425f6e8f9
     adc1cf4604

Bug: 24756974
Bug: 26743676
Change-Id: Ief2a40b5971b3eb97d765f934d20ce7f2ef25665
2016-02-18 13:46:12 -08:00
Chris Tate
40d8823dd3 Merge "Add android:backupInForeground" into nyc-dev 2016-02-18 21:43:28 +00:00
Chong Zhang
0eac75f53b Merge "Use background drawable from the client" into nyc-dev
am: 82268228a7

* commit '82268228a7c273a6a1af571427e34c9d1adc7a02':
  Use background drawable from the client
2016-02-18 21:40:43 +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 1cc95075e8)
2016-02-18 21:20:11 +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
Adam Powell
f5afdb09a6 Restore auto-launch behavior for ACTION_CHOOSER with a single choice
For the initial release of Marshmallow auto-launching was suppressed
for ChooserActivity if there was only a single choice in order to let
the user confirm what would be launched. In practice, many apps use
ACTION_CHOOSER when they should probably use implicit intents, but
still others have use cases where setting a default doesn't make sense
and the user should still be able to make a choice when one is
available.

As the user confirmation didn't buy much in terms of developer API
expectations (ACTION_CHOOSER being a forced choice) and it adds
speedbumps to existing apps in the ecosystem, revert this change.

Bug 27243827

Change-Id: Id8fd5385d5b1f459e80b0096efe7e2944264739a
2016-02-18 12:43:47 -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
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
Erik Kline
060838dcfc Add Protocol.BASE_ETHERNET am: ca4c61aa9f
am: bc163f07ee

* commit 'bc163f07ee77b6f2b6cee02156935eab476b19a8':
  Add Protocol.BASE_ETHERNET
2016-02-18 19:00:00 +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
Erik Kline
bc163f07ee Add Protocol.BASE_ETHERNET
am: ca4c61aa9f

* commit 'ca4c61aa9f7396a167202ea83f4d02f7f62ba482':
  Add Protocol.BASE_ETHERNET
2016-02-18 18:19:06 +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
Yohei Yukawa
96196358a5 Merge "Fix bugs in logic to find a default selectd IME." into nyc-dev
am: 218c2ab00a

* commit '218c2ab00ae1597e2728d8b2c865269717150dd3':
  Fix bugs in logic to find a default selectd IME.
2016-02-18 09:34:21 +00:00
Yohei Yukawa
218c2ab00a Merge "Fix bugs in logic to find a default selectd IME." into nyc-dev 2016-02-18 09:30:45 +00:00