148767 Commits

Author SHA1 Message Date
Tyler Gunn
158cf83140 am fbcb50db: Merge "Add BIND_CONNECTION_SERVICE permission." into lmp-dev
* commit 'fbcb50db877854e68031b157f891be29b87eb7f7':
  Add BIND_CONNECTION_SERVICE permission.
2014-08-15 23:25:59 +00:00
Adam Lesinski
7920573234 am 58157586: Merge "Add FeatureGroup to PackageInfo" into lmp-dev
* commit '58157586ef58387bb1e49930477b8b9c90bb0991':
  Add FeatureGroup to PackageInfo
2014-08-15 23:10:18 +00:00
Jeff Sharkey
5afc45971a am a1af0d42: Merge "PackageInstaller API refactoring." into lmp-dev
* commit 'a1af0d42e47379e83500dbbb1949bf93033f3be6':
  PackageInstaller API refactoring.
2014-08-15 23:10:13 +00:00
Ihab Awad
ac1dc1add6 am 578d6c7d: Merge "Fix problems with wiring of initializing calls (1/2)" into lmp-dev
* commit '578d6c7d3404563a5c62afa4140e1db085c34e06':
  Fix problems with wiring of initializing calls (1/2)
2014-08-15 23:03:43 +00:00
Robert Greenwalt
2d6c37cd66 am 90e32866: Merge "Configure MTU based on network MTU parameter" into lmp-dev
* commit '90e32866d257e2d3ab66a2c8c59abb179a080797':
  Configure MTU based on network MTU parameter
2014-08-15 22:16:57 +00:00
Jeff Davidson
c4f1557ba2 am bffe81a7: Merge "Fix default scorer provisioning." into lmp-dev
* commit 'bffe81a70721acab9e8b912206559cd53725c6c7':
  Fix default scorer provisioning.
2014-08-15 22:00:58 +00:00
Jay Shrauner
1cfb60f0b5 am 4a21b277: Merge "Prevent ConcurrentModificationExceptions" into lmp-dev
* commit '4a21b277b9ae7087c1dad6c13b50c50d6af7c733':
  Prevent ConcurrentModificationExceptions
2014-08-15 22:00:53 +00:00
Adam Lesinski
9e4056b7af am 2fdf2db8: Merge "Fix assumption about DynamicRefTable in aapt" into lmp-dev
* commit '2fdf2db8f15a23fea354ecbf4929585dc4c44e5c':
  Fix assumption about DynamicRefTable in aapt
2014-08-15 21:53:01 +00:00
Sunny Goyal
be55d637d9 am c4949481: Merge "Returning null when preview image is not available for AppWidgetProviderInfo" into lmp-dev
* commit 'c49494811aa1ed42c3f0b0519cb037e239f8b0e8':
  Returning null when preview image is not available for AppWidgetProviderInfo
2014-08-15 21:41:11 +00:00
Christopher Tate
1db2391d9f am 2c286400: Merge "Tighten restore-at-install behavior" into lmp-dev
* commit '2c286400bf4913c24dea7d0653314bdf162aaa16':
  Tighten restore-at-install behavior
2014-08-15 21:41:06 +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
Christopher Tate
6cbc07b7c0 Merge "Tighten restore-at-install behavior" into lmp-dev 2014-08-15 21:23:40 +00:00
Justin Mattson
d3077b95f8 am f6c0767d: Merge "Add fragment animations to setup leanback theme" into lmp-dev
* commit 'f6c0767d46d5f42129a760c705ad0cb6e1e2fbe6':
  Add fragment animations to setup leanback theme
2014-08-15 21:03:06 +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
Amith Yamasani
f62621845c am a728a418: Merge "Copy certain settings to the managed profile" into lmp-dev
* commit 'a728a4182ab5db257e6a1f90519c10ae00f29967':
  Copy certain settings to the managed profile
2014-08-15 20:52:44 +00:00
Julia Reynolds
bceac60c98 am 08aeb505: Merge "Apply lockdowns when user restrictions are set." into lmp-dev
* commit '08aeb505d0f65c678e27214170aaf7ad14b88c79':
  Apply lockdowns when user restrictions are set.
2014-08-15 20:31:49 +00:00
Jay Shrauner
a69adf7535 Merge "Prevent ConcurrentModificationExceptions" into lmp-dev 2014-08-15 19:21:54 +00:00
Jay Shrauner
229e3820dc Prevent ConcurrentModificationExceptions
Use sets backed by ConcurrentHashMaps instead of HashSets, and
CopyOnWriteArrayLists instead of ArrayLists, to prevent concurrent
exceptions if listeners try to remove themselves in callbacks while
iterating over the listeners.

Bug:16325026
Change-Id: I55e081eda6ba19fa466bbf019c648bbdaf833c33
2014-08-15 13:41:53 -07:00
Adrian Roos
529fd10831 am 384e2274: Fix errors that could lead to brightness flickering
* commit '384e2274834a788e1808951a2b486c14daf474ab':
  Fix errors that could lead to brightness flickering
2014-08-15 19:16:10 +00: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
Ihab Awad
78fc9220d4 Merge "Fix problems with wiring of initializing calls (1/2)" into lmp-dev 2014-08-15 19:10:34 +00:00
Robert Greenwalt
bd431ee5d3 Merge "Configure MTU based on network MTU parameter" into lmp-dev 2014-08-15 19:10:34 +00:00
Adrian Roos
b7ebbded5f Fix errors that could lead to brightness flickering
Ensures that changing the brightness doesn't lead to
another write to settings from SystemUI. Also makes
sure that a BrightnessDialog from a background user
is never showing. While we're in there, fix the obsolete
window flags as well and ensure BrightnessDialog only ever
allocates one BrightnessController.

Bug: 16297345
Change-Id: Id95b598b0fa99680072bc160afb00d2cd49f05ca
2014-08-15 19:09:09 +00: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
Tyler Gunn
a2897ea9d8 Merge "Add BIND_CONNECTION_SERVICE permission." into lmp-dev 2014-08-15 18:56:10 +00:00
Tyler Gunn
0dae9a4cfa Add BIND_CONNECTION_SERVICE permission.
- Added system permission.
- Added enforcement in ConnectionService API class.

Bug: 16171070
Change-Id: Idbd26a31e8f6bb59d3e881a1e5885a44026f2fbd
2014-08-15 15:55:20 -07: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
Justin Mattson
e9695fec7a Merge "Add fragment animations to setup leanback theme" into lmp-dev 2014-08-15 18:50:14 +00: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
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
Ruchi Kandoi
cb654362d1 am 1bac45b5: Merge "Revert "PowerManager: Adds a call to reduce refresh rate while device is in BatterySaverMode"" into lmp-dev
* commit '1bac45b552c7b76298f1376f3eccd103d12f5645':
  Revert "PowerManager: Adds a call to reduce refresh rate while device is in BatterySaverMode"
2014-08-15 18:42:43 +00:00
Chet Haase
b9b9704bef am 6954e4f0: Merge "Minor doc fixes from API council recommendations." into lmp-dev
* commit '6954e4f0da90e4a0a5c58deed76e2fff2e0aa34b':
  Minor doc fixes from API council recommendations.
2014-08-15 18:42:38 +00:00
Erik Pasternak
793c53f626 am b7d0449d: Merge "Add metadata and notifications to OneMedia" into lmp-dev
* commit 'b7d0449d34c8f46d7c1d6aa96ef4ae6490da16f6':
  Add metadata and notifications to OneMedia
2014-08-15 18:30:28 +00: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
John Spurlock
c9c17734cd am dcd90bbe: Merge "Zen: tweak audience interruption logic." into lmp-dev
* commit 'dcd90bbe69d31fbeaa8929e42077b7128da18c12':
  Zen: tweak audience interruption logic.
2014-08-15 18:21:35 +00:00
RoboErik
6d4fd5dc12 am 9ea4316f: Merge "Fix crash in legacy apps that register without a looper" into lmp-dev
* commit '9ea4316f4ce8c4bb4a9a1dad8332e300dc475890':
  Fix crash in legacy apps that register without a looper
2014-08-15 18:15:06 +00:00
Narayan Kamath
178d65729e am f58fd973: Merge "Fix getPackageInfo for the "android" package in the system server." into lmp-dev
* commit 'f58fd973f4f9f712d9d97b26e6c3afd22145463a':
  Fix getPackageInfo for the "android" package in the system server.
2014-08-15 18:04:01 +00:00
Andres Morales
63cec26dd0 am f099ee6a: Merge "Fix issue where unlock handlers are not properly updated" into lmp-dev
* commit 'f099ee6ae4cc4f2d66a1c31f4cd2a908d0e02082':
  Fix issue where unlock handlers are not properly updated
2014-08-15 17:25:11 +00:00
Adam Lesinski
a25222f5dc am 41cdc4c7: Merge "Revert "Fix aapt dump for APKs with no resources"" into lmp-dev
* commit '41cdc4c75c2ea8c67bcb773cd422b405e025fa25':
  Revert "Fix aapt dump for APKs with no resources"
2014-08-15 17:25:04 +00:00
Brian Carlstrom
d38905b785 am 7fca8e30: Merge "Disable verification based on vold.decrypt. [frameworks/base]" into lmp-dev
* commit '7fca8e30e91f893a2831e63c1a47a86baf2c56b8':
  Disable verification based on vold.decrypt. [frameworks/base]
2014-08-15 17:10:46 +00:00
John Spurlock
2a5c373615 am 0ac3062e: Zen: Downtime now a condition provider, persist conditions.
* commit '0ac3062ed9aab98c26e669a91a0c3893a440b734':
  Zen: Downtime now a condition provider, persist conditions.
2014-08-15 15:16:19 +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
49d9653ee4 am 5a7b75c0: Remove setManagingTrust workaround
* commit '5a7b75c0c02f22b97e871f32b21470629e84ce9a':
  Remove setManagingTrust workaround
2014-08-15 14:35:38 +00:00
Adrian Roos
65c09b10ca Remove setManagingTrust workaround
Bug: 16622870
Change-Id: Ibdfdd420996081c055d0364f77b65dea6060cb9e
2014-08-15 14:29:55 +00:00