Commit Graph

4080 Commits

Author SHA1 Message Date
Rubin Xu
284e8a441a Merge "Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two." into nyc-dev am: 63d1ee4
am: 586da02

* commit '586da02e83084174519aead33c1329e76a73b479':
  Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two.

Change-Id: I18ec427abd07e39cfdc90d31be420c988ef1ec60
2016-04-05 15:00:04 +00:00
Rubin Xu
63d1ee45ee Merge "Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two." into nyc-dev 2016-04-05 14:52:02 +00:00
Alan Viverette
9fbf66ac37 Merge "Fix bad workaround docs in Resources.getDrawable()" into nyc-dev am: 16aaa3e
am: 1323b45

* commit '1323b45ff5bd4c0f4b28562b8ef8e3c6cee33fae':
  Fix bad workaround docs in Resources.getDrawable()

Change-Id: I014d58922ffe4c8376ac437bea5c99b99ea08396
2016-04-05 14:26:47 +00:00
Alan Viverette
952802e2d1 Fix bad workaround docs in Resources.getDrawable()
The real solution is to use ContextCompat, but we can't reference support
library from framework. C'est la vie.

Bug: 27727320
Change-Id: Ib9bcd5f2bdce1996f02fd44877df9ba202b26edc
2016-04-04 15:33:41 -04:00
Rubin Xu
e95057ade1 Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two.
Add more comment to EXTRA_QUIET_MODE

Bug: 27532254
Change-Id: I68a217561afca8b87f523c62393cdad097d5b75d
2016-04-04 16:08:47 +01:00
Todd Kennedy
b7a142063c Merge "Fix intent filter priorities" into nyc-dev am: 6dffdf8
am: c8647f9

* commit 'c8647f9ea47b8081cce54c96e745f091e0590b38':
  Fix intent filter priorities

Change-Id: I4ec37ac340ed083d346bb782146588d65e376a1b
2016-04-04 14:31:55 +00:00
Todd Kennedy
5585dd971e Fix intent filter priorities
There are now three rules that guard intent filter priorities:
1) Only privileged applications will be granted a >0 priority
   filter [previously, _all_ system applications could do this]
2) There are certain actions that are considered protected [eg
   ACTION_VIEW, ACTION_SEND, ...] and even privileged applications
   will NOT be granted a >0 priority filter. There is one, and
   only one, exception for the SetupWizard.
3) Updates will NOT be granted a priority greater than the priority
   defined on the system image.

Bug: 27450489
Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4
2016-04-01 12:48:51 -07:00
Russell Brenner
ad85c7be86 Merge "Add new protection level for setup wizard" into nyc-dev am: 3ccb354
am: 395db24

* commit '395db247fb8e1273fcc9d15e7821033477ca4e6c':
  Add new protection level for setup wizard

Change-Id: Ic6287b5bdaa66ffd4cfdc094329557ba12afd6a3
2016-04-01 16:36:31 +00:00
Russell Brenner
3ccb35421d Merge "Add new protection level for setup wizard" into nyc-dev 2016-04-01 16:22:49 +00:00
Todd Kennedy
34010044ea Merge "Allow retrieving info /system components" into nyc-dev am: 0242467
am: 320e7ef

* commit '320e7ef2b2468a3e00ebda557f3756cc94e713d6':
  Allow retrieving info /system components

Change-Id: I7640bdf4734a8a859c55aac78fe2655a3eae4a3c
2016-04-01 14:33:16 +00:00
Todd Kennedy
02424676c6 Merge "Allow retrieving info /system components" into nyc-dev 2016-04-01 14:21:21 +00:00
Russell Brenner
b23346639b Add new protection level for setup wizard
Adds PROTECTION_LEVEL_SETUP, a privileged permission for use only by
the setup wizard.

Bug: 20016740

Change-Id: Ib95e349c54d5d12465bf43162975dfb628ef2434
2016-03-31 17:32:07 -07:00
Todd Kennedy
d6ee0ba579 Allow retrieving info /system components
Generally we return info for the latest installed package; which could
either be a built-in [i.e. on the /system partition] package or a user
updated package. In certain circumstances, we want to be able to get
the version on the /system partition regardless of whether or not the
user has updated it. We do this by passing MATCH_FACTORY_ONLY to
getPackageInfo().

Bug: 27469181
Change-Id: I8dd1d110e2d72e5c6f024812d0b5d15d8b217347
2016-03-31 15:53:45 -07:00
Sunny Goyal
c93e9f5b8a Merge "Chaning LauncherActivityInfo to return a density specific non-badged icon" into nyc-dev am: 56d3dd8
am: 80d57ef

* commit '80d57efd94b7c394a39f78a2425d82aed5c75485':
  Chaning LauncherActivityInfo to return a density specific non-badged icon

Change-Id: Idda2dec39ecb821578ba213b4046e5210a6bfe63
2016-03-31 17:54:51 +00:00
Sunny Goyal
56d3dd8af7 Merge "Chaning LauncherActivityInfo to return a density specific non-badged icon" into nyc-dev 2016-03-31 16:56:31 +00:00
Jeff Sharkey
562ac8b9bb Merge changes Ifecff4f1,Ia302de46 into nyc-dev am: 2c0ae91
am: 4d5806d

* commit '4d5806d0e662e0163ad174f61779a4d4ddf48b81':
  Make preferred activities direct-boot aware.
  Make Parcelable classes final, API cleanup.

Change-Id: I7aa9858905cc241343da5a1fb3479bf3f74b8ba8
2016-03-31 07:00:10 +00:00
Jeff Sharkey
2c0ae91f2d Merge changes Ifecff4f1,Ia302de46 into nyc-dev
* changes:
  Make preferred activities direct-boot aware.
  Make Parcelable classes final, API cleanup.
2016-03-31 06:48:55 +00:00
Jeff Sharkey
70168dde6e Make Parcelable classes final, API cleanup.
Remove some Context methods that leaked through.  Add lint rule to
recommend using List<? extends Parcelable> instead of Parcelable[].

Bug: 27932224, 27930145, 27932911
Change-Id: Ia302de46cdb0c5101fa175a09316df91aeefcf0d
2016-03-30 23:31:39 -06:00
Sunny Goyal
bc48d8c6a8 Chaning LauncherActivityInfo to return a density specific non-badged icon
Bug: 27877821
Change-Id: I57c39c197b2480d9620a1719ace076cc6c936652
2016-03-30 15:56:34 -07:00
Makoto Onuki
24208cf7af Merge "Clean up javadoc." into nyc-dev am: 04a5473
am: 458e843

* commit '458e8436f93cb0e1ca2d2c49bd9e55f5fc11441e':
  Clean up javadoc.

Change-Id: I1193510ae71e49eb5a9bb634b97627cfbf02d5be
2016-03-30 19:21:47 +00:00
Makoto Onuki
0e65d36607 Clean up javadoc.
Bug 27548047

Change-Id: I10410c969136db634bb98687710d011d159bca07
2016-03-30 10:15:55 -07:00
Makoto Onuki
4f1f7b0167 Merge "ShortcutManager: Support secondary text field." into nyc-dev am: ca0ee28
am: a3d8cdc

* commit 'a3d8cdca997e0577bcb1d9091880a0267e2d3f38':
  ShortcutManager: Support secondary text field.

Change-Id: I5262a756c5fe50e498192aea8e247f46d5742edc
2016-03-30 16:17:36 +00:00
David Brazdil
dac7ce8efb Merge "Move OTA package update before fstrim, hide "Optimizing apps" dialog" into nyc-dev am: b67b5b9
am: 72ecc75

* commit '72ecc752ce1cb3683a6671e2de25123bead2df83':
  Move OTA package update before fstrim, hide "Optimizing apps" dialog

Change-Id: Ic4d927f18f741bf81ad64882e5acc1665f13809e
2016-03-30 16:16:09 +00:00
Makoto Onuki
ca0ee285bb Merge "ShortcutManager: Support secondary text field." into nyc-dev 2016-03-30 15:30:17 +00:00
David Brazdil
f5c444ffd4 Move OTA package update before fstrim, hide "Optimizing apps" dialog
This patch moves the updating of packages before performing fstrim,
which runs asynchronously anyway, and stops showing the UI dialog.

Bug: 27350503
Change-Id: I6fceda10d7696f9badb97978fb9dc7927d698a4b
2016-03-30 13:39:14 +01:00
Makoto Onuki
8fff90ca7c Merge "ShortcutManager: proper work profile support" into nyc-dev am: d5b745a
am: 4fc3441

* commit '4fc34416fb8d389557934f3000dab7b6fbafb97c':
  ShortcutManager: proper work profile support

Change-Id: I1a708988b7e9c505370e2399572dca6caa9d5cef
2016-03-30 00:29:13 +00:00
Makoto Onuki
e3ae7ec14a ShortcutManager: Support secondary text field.
Bug 27548047

Change-Id: I2d184bab2c26e351b7326945fa0cacf826f16d1e
2016-03-29 16:42:12 -07:00
Makoto Onuki
d5b745a9e6 Merge "ShortcutManager: proper work profile support" into nyc-dev 2016-03-29 22:45:03 +00:00
Suprabh Shukla
273472810b Merge "Removing unused intent extra" into nyc-dev am: 7a3bff1
am: 13638e2

* commit '13638e29df8a031c787e809ca9c62f303a7013b6':
  Removing unused intent extra

Change-Id: Ic61e004a36124515eb7d0cb4e24b85d9d5370116
2016-03-29 22:01:49 +00:00
Suprabh Shukla
7a3bff1847 Merge "Removing unused intent extra" into nyc-dev 2016-03-29 21:48:37 +00:00
Makoto Onuki
9da23fc6ac ShortcutManager: proper work profile support
Bug 27548047

Change-Id: I8acea3355f8974a551f53814624dec30732f7b2f
2016-03-29 14:42:02 -07:00
Michal Karpinski
7959416308 Merge "Moving app process logging from AMS to PMS" into nyc-dev am: 5393784
am: acc9468

* commit 'acc9468e3324046f6d7ce06de9a3d19e16849ba1':
  Moving app process logging from AMS to PMS

Change-Id: I9dcd57ee35a3102b9e13bde64f24f56991dd2620
2016-03-29 20:46:29 +00:00
Michal Karpinski
53937849fc Merge "Moving app process logging from AMS to PMS" into nyc-dev 2016-03-29 20:35:47 +00:00
Michal Karpinski
b52a461851 Moving app process logging from AMS to PMS
Bug: 26796347
Change-Id: I21894c2edb41929f6ecd3880667c53e00acef677
2016-03-29 19:07:29 +01:00
Makoto Onuki
4824ed486c Merge "ShortcutManager: Fix work profile" into nyc-dev am: bdda585
am: 74b8a65

* commit '74b8a6545d337f49031f28908bce3d9db845cd22':
  ShortcutManager: Fix work profile

Change-Id: I022371e785a944c01cf5fe307b53dbad71e8cc6c
2016-03-29 15:46:40 +00:00
Makoto Onuki
d99c6f04bb ShortcutManager: Fix work profile
- Pinned shortcuts need to know not only which package
has pinned them, but also on which user's, due to work profile.

- Launcher can always launch shortcuts that it has pinned.

Bug 27548047

Change-Id: I23b4e7dfbb6ecc42099d31008bcfd61d44e2c7fb
2016-03-28 18:47:39 -07:00
Suprabh Shukla
2810b694f5 Removing unused intent extra
Change-Id: If3904d0b3878390e6a49776aa8fcbd4d8592016d
2016-03-28 16:44:04 -07:00
Andrii Kulian
11073cda39 Merge "Update ActivityInfo#WindowLayout apis (1/3)" into nyc-dev am: 47869bd
am: d5afdc7

* commit 'd5afdc71c96960ec9acf405a8ae1222aba48ebf2':
  Update ActivityInfo#WindowLayout apis (1/3)
2016-03-28 00:34:11 +00:00
Andrii Kulian
47869bd446 Merge "Update ActivityInfo#WindowLayout apis (1/3)" into nyc-dev 2016-03-28 00:25:01 +00:00
Andrii Kulian
2e751b8c77 Update ActivityInfo#WindowLayout apis (1/3)
Adds documentation, renames Layout to WindowLayout and
splits #minimalSize to #minimalWidth and #minimalHeight.

Bug: 27528326
Change-Id: Idb440cb081a14ccdc83309284e906454633c4504
2016-03-27 15:35:33 -07:00
Jeff Sharkey
3c664a9b39 Update PRE_BOOT_COMPLETED for FBE. am: bd91e2f
am: bef5aad

* commit 'bef5aad065fd2f5f222ac14a8d063d12348c7c34':
  Update PRE_BOOT_COMPLETED for FBE.
2016-03-27 17:50:04 +00:00
Jeff Sharkey
bd91e2f3f6 Update PRE_BOOT_COMPLETED for FBE.
Now that CE data isn't available until after a user is unlocked, we
need to delay the PRE_BOOT_COMPLETED broadcasts.  This is done by
adding a new RUNNING_UNLOCKING user state to the UserController
lifecycle.

We now track the last fingerprint a user was logged in under, and we
dispatch PRE_BOOT receivers when that fingerprint changes.  To work
around battery pull issues, we only persist the updated fingerprint
once all PRE_BOOT receivers have finished.  This is less granular
than the original solution, but it's still correct.  We only consider
a user as "logged in" once it transitions into the RUNNING_UNLOCKED
state.

When starting a process, track if the user was "unlocked" when
started, so that we only spin up unaware providers in processes
started before user unlock.

Add generic IProgressListener to communicate PRE_BOOT progress and
strings up to lock screen.  For now, LockSettingsService just blocks
until finished, but it could display these strings in the future.

Bug: 27220885
Change-Id: I349439776b885acd32f6a578d8951ffd95640be2
2016-03-27 10:56:48 -06:00
Alex Klyubin
86acec8135 Merge "Ignore signature stripping protection for preinstalled APKs." into nyc-dev am: e60d72f
am: c860aec

* commit 'c860aecc2f632ba7a0a1e53755b778b52645bb7e':
  Ignore signature stripping protection for preinstalled APKs.
2016-03-24 19:54:08 +00:00
Alex Klyubin
e60d72f49a Merge "Ignore signature stripping protection for preinstalled APKs." into nyc-dev 2016-03-24 19:46:44 +00:00
Alex Klyubin
9b59bc459b Ignore signature stripping protection for preinstalled APKs.
The current build process may currently strip APK Signature Scheme v2
signatures from prebuilt APKs to be installed on the system or vendor
partitions. However, it leaves intact the signature scheme rollback
protections introduced by APK Signature Scheme v2. Due to a bug, when
the system extracts signer certificates from preinstalled APKs, it
encounters the rollback protection and aborts the extraction process.
This manifests itself as some preinstalled packages not appearing as
installed.

This change makes the system ignore signature scheme rollback
protections when extracting certificates from preinstalled APKs. This
is fine because the process of extracting certificates from
preinstalled APKs does not care about validity/integrity of signatures
and the APKs. It only cares about extracting signer certificates.

Bug: 27829513
Change-Id: I3bed463e776b057e93a0fce915db4014946be1f9
2016-03-24 12:02:20 -07:00
Andreas Gampe
aa268b773e Merge "Frameworks/base: Refactor package manager" into nyc-dev am: a7f2bcc
am: 31e9eec

* commit '31e9eec4ea3a359d572d4eb843537484f18ceb84':
  Frameworks/base: Refactor package manager
2016-03-24 02:11:50 +00:00
Andreas Gampe
a7f2bccca3 Merge "Frameworks/base: Refactor package manager" into nyc-dev 2016-03-24 01:59:24 +00:00
Andreas Gampe
bdd30d86ef Frameworks/base: Refactor package manager
Introduce a mapping between dexopt reasons and compiler filters. Use
reasons in package manager and other classes, where possible.

Change PackageDexOptimizer to accept a compilation filter. Adapt for
the split-out profile merging. Pass compilation filter to installd.

Bug: 27689078
Change-Id: I8c0ea6f10fbfdbd096adecc52abfd2466d048fdc
2016-03-23 16:21:21 -07:00
Amith Yamasani
c731dd758d Merge "Localize owner\'s name to current locale until changed" into nyc-dev am: df4c40d
am: 195ed1e

* commit '195ed1e61b52a1c0616846c61029b5db7c89928d':
  Localize owner's name to current locale until changed
2016-03-23 22:45:35 +00:00
Amith Yamasani
6f48d6ef35 Localize owner's name to current locale until changed
Don't set a name for the system user and always return a localized
name until the user explicitly sets a name.

Bug: 27814125
Change-Id: I7972a45d77c07d9efbd67d5b360bacee46247a66
2016-03-23 14:28:25 -07:00