Commit Graph

39492 Commits

Author SHA1 Message Date
Ruben Brunk
e364aecf17 Merge "camera2: Add jpeg metadata for LEGACY shim." into lmp-dev 2014-08-15 18:45:09 +00:00
Ruben Brunk
1dc1326eae camera2: Add jpeg metadata for LEGACY shim.
Bug: 15116722
Change-Id: I8abef3ca9a47b2f93978a758aa59c3b915a7e000
2014-08-16 00:03:04 +00:00
Ruben Brunk
a9bc355910 camera2: Fix shim aspect ratio scaling.
Bug: 16494207
Change-Id: I4bd40dee1caaf8c83a0853d48d44cc97151f9b41
2014-08-15 23:51:52 +00:00
Adam Lesinski
91306bccf1 Merge "Add FeatureGroup to PackageInfo" into lmp-dev 2014-08-15 18:56:10 +00:00
Adam Lesinski
d3edfde51b Add FeatureGroup to PackageInfo
FeatureGroups replace top-level FeatureInfo objects.
FeatureGroups inherit top-level FeatureInfos but override
them if the feature names are the same.

Bug:16822121

Change-Id: I80b2cb778a0fbcb4521efce986fba641e0914290
2014-08-15 15:53:35 -07:00
Jeff Sharkey
3e3b251f46 Merge "PackageInstaller API refactoring." into lmp-dev 2014-08-15 18:56:10 +00:00
Jeff Sharkey
a0907436c0 PackageInstaller API refactoring.
Switch to using IntentSender for results to give installers easier
lifecycle management.  Move param and info objects to inner classes.

Bug: 17008440
Change-Id: I944cfc580325ccc07acf22e0c681a5542d6abc43
2014-08-15 15:57:02 -07:00
Robert Greenwalt
bd431ee5d3 Merge "Configure MTU based on network MTU parameter" into lmp-dev 2014-08-15 19:10:34 +00:00
Jeff Davidson
cab3eb0c0b Merge "Fix default scorer provisioning." into lmp-dev 2014-08-15 21:23:40 +00:00
Adam Lesinski
91348eb957 Merge "Fix assumption about DynamicRefTable in aapt" into lmp-dev 2014-08-15 21:23:40 +00:00
Adam Lesinski
2cb761e3dd Fix assumption about DynamicRefTable in aapt
Packages without any resources should not expect to have
a DynamicRefTable.

Bug:16895517
Bug:17056720
Change-Id: Id006f6bdbf08f30505f6ba5982bc9d1b09db0f0a
2014-08-15 14:01:43 -07:00
Sunny Goyal
336eaae177 Merge "Returning null when preview image is not available for AppWidgetProviderInfo" into lmp-dev 2014-08-15 18:45:09 +00:00
Christopher Tate
6cbc07b7c0 Merge "Tighten restore-at-install behavior" into lmp-dev 2014-08-15 21:23:40 +00:00
Sunny Goyal
092e196274 Returning null when preview image is not available for AppWidgetProviderInfo
The default application icon generally has a different aspect ratio that a
preview image, and cannot transparently be  used in place of the image.
Returning null will allow the apps to handle the case as they see fit.

Change-Id: Ie6e8e16dd7b4e58b222187a81c62d27eccab45a9
2014-08-15 13:02:59 -07:00
Amith Yamasani
d97a0e7281 Merge "Copy certain settings to the managed profile" into lmp-dev 2014-08-15 19:14:43 +00:00
Amith Yamasani
4f7e2e334e Copy certain settings to the managed profile
All reads of those specific settings will go to the primary user.
Inserts to primary also go to managed profiles in order to notify
any observers.

This enables Location settings to be shared by both profiles.
Also some other settings related to IME and Accessibility since
those services are shared across the profiles.

Bug: 16457210
Change-Id: Ib8fd697b5c78027fcbaf245d82dda5e6d6aab4f0
2014-08-15 13:42:21 -07:00
Julia Reynolds
d438deffad Merge "Apply lockdowns when user restrictions are set." into lmp-dev 2014-08-15 19:03:20 +00:00
Julia Reynolds
3d9eb78fe9 Apply lockdowns when user restrictions are set.
Previously DMAgent would apply these lockdowns before/
after setting the matching user restrictions.

Bug: 16701642
Bug: 16945830
Bug: 16944983
Change-Id: Ib4f7145055687f12408d6ccacd8e6380406a32b2
2014-08-15 16:16:38 -04:00
Christopher Tate
a63246d6da Tighten restore-at-install behavior
Harden the guarantee that if we're asked about a possible restore,
we always ALWAYS report back to the package manager.  This involved
closing "should never happen" edge cases around provisioning/auto-restore
setting that nevertheless were happening.

Also, on the auto-restore setting front, make sure to plumb that
system API through appropriately, since going behind its back and
manipulating the secure setting directly would cause things to get
out of step.

Bug 17060654

Change-Id: I52ca9c1ffbfc0bd6b57196157500d0868bfc2989
2014-08-15 11:22:01 -07:00
Narayan Kamath
2b3b706e14 Merge "Fix getPackageInfo for the "android" package in the system server." into lmp-dev 2014-08-15 04:32:23 +00:00
Narayan Kamath
3480ab45c8 Fix getPackageInfo for the "android" package in the system server.
bug: 16555230
Change-Id: I90ebf9b35fda8246b0079f67b1469f96c3b4ede2
2014-08-15 18:14:44 +01:00
Andres Morales
e6b63e6c6f Merge "Fix issue where unlock handlers are not properly updated" into lmp-dev 2014-08-15 08:11:59 +00:00
Andres Morales
f9a97942e1 Fix issue where unlock handlers are not properly updated
If an unlock handler already exists, we need to try
to update the tech mask for it. Don't permit unlock
handlers with no tech mask.

Bug: 17054331
Change-Id: I54a885d28bdd8ce41d8646d968621c7d6abc9387
2014-08-15 17:08:24 +00:00
John Spurlock
4db0d98b42 Zen: Downtime now a condition provider, persist conditions.
- Persist the entire exit condition instead of only the id.
- Make downtime a proper condition provider (similar to the
  existing countdown provider for time-based conditions)
- Move all downtime-related items out of ZenModeHelper and
  into the new condition provider.
- Reevaluate downtime more often, when any of its inputs change.
- Make sure downtime appears as an available condition in the
  condition panel when applicable.

Bug:16296125
Bug:16211189
Bug:17031767
Change-Id: I1d8269a4e6fe170ce776bf932dbbdfb29dd25dd7
2014-08-15 15:06:15 +00:00
Adrian Roos
65c09b10ca Remove setManagingTrust workaround
Bug: 16622870
Change-Id: Ibdfdd420996081c055d0364f77b65dea6060cb9e
2014-08-15 14:29:55 +00:00
Narayan Kamath
6c4b9de8f1 Validate instruction sets passed to installd.
We don't want folks passing down arbitrary strings.

bug: 16837404
Change-Id: I73ac66b376f1401f9f95f3c6323da6242ac8ed3d
2014-08-15 12:50:10 +01:00
Narayan Kamath
29564cd245 Remove system_server classes from the boot image.
We set the system_server classpath in the environment
(like we do with BOOTCLASSPATH). After the zygote forks
the system_server, we dexopt the classpath (if needed)
and then launch the system server with the correct
PathClassLoader. This needed several small / medium
refactorings :

- The logic for connecting to installd is now in a separate
  class and belongs in the system_server.
- SystemService / SystemServiceManager have now moved to
  classes.jar. They are only used from there, and since they
  use Class.forName, we want them to be loaded by the
  system_server classloader, and not the bootclassloader.
- BootReceiver now moves to frameworks.jar, because it is
  used by ActivityThread and friends.

bug: 16555230

Change-Id: Ic84f0b2baf611eeedff6d123cb7191bb0259e600
2014-08-15 13:37:03 +01:00
w19976
15afd81158 Configure MTU based on network MTU parameter
Add logic to obtain the mtu from the network PCO parameter and set it to kernel
when the mobile data connection is established. When there is no PCO mtu configured
from the network, the mtu size defined in the corresponding APN will be used. In case
no mtu size is defined for an APN used for data connection, the MCC/MNC based MTU
defined  in the framework overaly will be applied.

bug:17046179
Change-Id: I6465d4b8f2076aaa380ae3617fb3f24adbe136d4
2014-08-14 20:34:13 -07:00
Jeff Davidson
56f9f73a5a Fix default scorer provisioning.
Use Settings.Global instead of SharedPreferences (which don't work) to
track whether we've run the one-time provisioning step of activating
the build-time configured default scorer.

Bug: 16980605
Change-Id: I093cdd6f4f1110960078a186191c4e02b5543d6a
2014-08-14 16:47:23 -07:00
Jeff Sharkey
82d6d337b3 Merge "Some networks may have null ifaces, I guess?" into lmp-dev 2014-08-14 16:46:52 +00:00
Jeff Sharkey
9da2f1e007 Some networks may have null ifaces, I guess?
Seems like a bug further upstream, but guard ourselves against it
for now.

Bug: 17033841
Change-Id: Id0e5895c3389b63d4e34b1fb064efef8b72cd609
2014-08-14 22:42:27 +00:00
Fabrice Di Meglio
b1a50f2dff Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings.
SettingsPreferenceFragment$1@273c8fdb was not registered

- add onUnbindPreferences() call to match onBindPreferences()
- this new method is @hide so it does not impact the APIs

Change-Id: Iee0ab8a4ecc2046f89fb96cc52af150e835f658c
2014-08-14 18:00:11 +00:00
Doug Zongker
f0433e50c7 Merge "@hide RECOVERY permission" into lmp-dev 2014-08-12 23:14:35 +00:00
Jorim Jaggi
84a3e7aacf Use different unlock animation when going to full shade
Also fixes a bug that the notify flag was not reset, and fix the
transition for the phone/camera affordance (in these cases, no
animation is needed).

Bug: 15991916
Change-Id: Idbb4fa40f86bda597cd66cc38da838ef4f75514d
2014-08-14 12:29:25 +00:00
Prerepa Viswanadham
621085e50f Protect from malformed advt with invalid manf_id/data combo
Bug: 16979645
Change-Id: Ie7ea00ed20cbad1120c7582bb2bafd44b4295052
2014-08-14 05:33:11 +00:00
Prerepa Viswanadham
ee3cc8bf17 Prevent crash in Gatt service due to null pointer in
BluetoothGattCharacteristic from framework

Bug 16899517

Change-Id: Ib30ddefee07c2953f9a7faeb4eaa823feeebdc8f
2014-08-14 05:32:06 +00:00
Wei Wang
347a882de3 Merge "Clean up advertise and scan clients upon bluetooth down." into lmp-dev 2014-08-12 23:14:49 +00:00
Wei Wang
ee80922c6a Clean up advertise and scan clients upon bluetooth down.
Fixes b/16528460

This allows Advertiser and Scanner to be reused after bluetooth recycle,
which follows same behavior for BluetoothAdapter.

Also prints manufacturer data array for ScanRecord.

Change-Id: I78bca40ac294433782a054bf2a00a775dac02d96
2014-08-13 11:08:48 -07:00
Jose Lima
235510e672 Made AlarmClockInfo a nested class in AlarmManager
Bug: 16959028
Change-Id: I150eaaff765d1e214c3621c1bf50162ec0dac8ec
2014-08-14 02:10:41 +00:00
Jose Lima
4b6c6697da Renamed "media playing" APIs to "visible behind"
- Request from API Review: rename the media playing APIs to a more
     generic name, reflecting the background visibility feature these
     methods actually control.
   - Made the new isActivityVisibleBehind().
   - Changed convertFromTranslucent() and convertToTranslucent() to be
     SystemApi.

Bug: 16959028
Change-Id: I526eac22f44273b3254dd6201f89194d13e597e2
2014-08-14 02:00:04 +00:00
Jeff Brown
c12035cd40 Log who is calling goToSleep().
Change-Id: Ibae61c90ee115735835e878bb3bf79eedaa0ae44
2014-08-14 01:56:48 +00:00
Dianne Hackborn
9c3e74f1f7 Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
...can lead to launching of un-exported activities

We now validate the array map after unparcelling to make sure there
are no duplicate keys.

And to make up for the performance overhead this introduces, I switched
the parcelling/unparcelling code to write keys as explicit string
objects rather than generic values.  There was no reason to use generic
values since the write method itself only accepts an array map with
String keys.

Change-Id: I57bda9eb79ceaaa9c1b94ad49d9e462b52102149
2014-08-13 17:24:45 -07:00
Alan Viverette
f2546bf423 Merge "Add API for obtaining max text length for accessibility" into lmp-dev 2014-08-12 23:14:35 +00:00
Jim Miller
989b68e82d Merge changes I77f49fe8,I305e927a into lmp-dev
* changes:
  API review - move confirm credential constants from Intent
  Revert "Add new intent to prompt user for their device credential."
2014-08-12 23:14:48 +00:00
Jim Miller
66093a9024 API review - move confirm credential constants from Intent
Moves constants from Intent to KeyguardManager.

Fixes bug 17006280

Change-Id: I77f49fe85850a501e1531d39aad7446c9bca5801
2014-08-15 00:38:21 +00:00
Jim Miller
4d64746d6a Revert "Add new intent to prompt user for their device credential."
Move API to KeyguardManager.

Fixes bug 17006280

This reverts commit 2e7beadedeb7d41d8c2d1cc62956bdd9f5081d26.

Change-Id: I7b58bb4d9db828028c1021f17b01745c5ec2161e

Conflicts:
	core/java/android/content/Intent.java
2014-08-15 00:35:50 +00:00
Glenn Kasten
3750e75f75 Merge "Move setting to disable automatic USB routing" into lmp-dev 2014-08-12 23:14:35 +00:00
Yorke Lee
15f83c6f64 Disable call log for users with DISALLOW_OUTGOING_CALLS restriction
Bug: 16217514
Change-Id: Iacd5699d0a540ca0e5a678662379bf8c611f7462
2014-08-13 21:17:53 +00:00
Glenn Kasten
34cc4db180 Move setting to disable automatic USB routing
This moves the setting from System to Secure per review.

Bug: 16381952
Change-Id: I2497ca66b4f346839490c29295528fac70e94494
2014-08-13 13:31:04 -07:00
Amith Yamasani
95ab784944 Decouple user limit from guest creation
Allow Guest to be created even if there are N users.
Allow N users to be created even if there are N-1 users
   and a Guest.
Limit number of guests and managed profiles that can
be added.

Added unit tests.

Bug: 15934700
Change-Id: I1a8f0fa38a91d71ef7b2980e05c974244dfc337a
2014-08-13 20:09:20 +00:00