Alan Viverette
a74b02ca87
am b428f3b0: am 1125e88d: am 04ce8195: Merge "Scrapping the view at position zero is still position zero" into lmp-dev
...
* commit 'b428f3b0122f9edeb9f4efb7389a50a63594a640':
Scrapping the view at position zero is still position zero
2014-08-16 03:33:43 +00:00
Alan Viverette
5502a547eb
am 1125e88d: am 04ce8195: Merge "Scrapping the view at position zero is still position zero" into lmp-dev
...
* commit '1125e88d3955f900242754691238995b45d00027':
Scrapping the view at position zero is still position zero
2014-08-16 03:12:58 +00:00
Ruben Brunk
4ee1076613
am ad3aaea5: am 8d392ff3: am f1aea7f9: Merge "camera2: Add jpeg metadata for LEGACY shim." into lmp-dev
...
* commit 'ad3aaea5a4fd0526637e5ebc8863e932b6f36b19':
camera2: Add jpeg metadata for LEGACY shim.
2014-08-16 00:45:34 +00:00
Ruben Brunk
d927d37af7
am 0db517c8: am 8b90513e: am b62eea57: camera2: Fix shim aspect ratio scaling.
...
* commit '0db517c8fcc811d8871ce439a5c3a81d80511424':
camera2: Fix shim aspect ratio scaling.
2014-08-16 00:45:29 +00:00
Adam Lesinski
fe2ee96947
am d6ce3e36: am 345efd9a: am 58157586: Merge "Add FeatureGroup to PackageInfo" into lmp-dev
...
* commit 'd6ce3e363ea229d4e00946492be2c9d60a2b049b':
Add FeatureGroup to PackageInfo
2014-08-16 00:44:55 +00:00
Jeff Sharkey
00eb0dc691
am 870e1f60: am 61c28588: am a1af0d42: Merge "PackageInstaller API refactoring." into lmp-dev
...
* commit '870e1f6039b00a4878a01c59e8b407571f6361ba':
PackageInstaller API refactoring.
2014-08-16 00:44:50 +00:00
Robert Greenwalt
305fd05e19
am 5be21366: am 26ca16ce: am 90e32866: Merge "Configure MTU based on network MTU parameter" into lmp-dev
...
* commit '5be213664688e2751ad6d76a40e9cd7c5823bb6a':
Configure MTU based on network MTU parameter
2014-08-16 00:44:23 +00:00
Jeff Davidson
92cfac2c71
am 640e02a6: am 8450fe3b: am bffe81a7: Merge "Fix default scorer provisioning." into lmp-dev
...
* commit '640e02a644b45cedc76878a2594d51374f2bc7ed':
Fix default scorer provisioning.
2014-08-16 00:44:14 +00:00
Adam Lesinski
99db87c1ba
am afe71dba: am 5bcfb6b9: am 2fdf2db8: Merge "Fix assumption about DynamicRefTable in aapt" into lmp-dev
...
* commit 'afe71dba4adb8ad8d07146a1d17211875b42c012':
Fix assumption about DynamicRefTable in aapt
2014-08-16 00:44:04 +00:00
Sunny Goyal
c340783a50
am b42afabc: am 6ba6c6ce: am c4949481: Merge "Returning null when preview image is not available for AppWidgetProviderInfo" into lmp-dev
...
* commit 'b42afabcaf88857acbffc88458278393192a164b':
Returning null when preview image is not available for AppWidgetProviderInfo
2014-08-16 00:43:53 +00:00
Christopher Tate
c71107b170
am a2f65fd4: am 5e6afbc2: am 2c286400: Merge "Tighten restore-at-install behavior" into lmp-dev
...
* commit 'a2f65fd48d0c018fb2891d6e983472f7bd747f81':
Tighten restore-at-install behavior
2014-08-16 00:43:48 +00:00
Amith Yamasani
f4146ab007
am 9d579953: am e52fb6f4: am a728a418: Merge "Copy certain settings to the managed profile" into lmp-dev
...
* commit '9d579953a8b9704f8c43775991be83df7df91b2b':
Copy certain settings to the managed profile
2014-08-16 00:43:23 +00:00
Julia Reynolds
34b5930fc3
resolved conflicts for merge of 9ef71fb5 to master
...
Change-Id: I5b03835eddb1d0f5f3d93814732213458d5cd5d2
2014-08-15 20:26:42 -04:00
Ruben Brunk
384681f18b
am 8d392ff3: am f1aea7f9: Merge "camera2: Add jpeg metadata for LEGACY shim." into lmp-dev
...
* commit '8d392ff3b6430b144c7b3d94aed5f0c0154c7440':
camera2: Add jpeg metadata for LEGACY shim.
2014-08-16 00:22:01 +00:00
Ruben Brunk
ffd87c21ab
am 8b90513e: am b62eea57: camera2: Fix shim aspect ratio scaling.
...
* commit '8b90513e20c7e99731e5e8c05b8705ba8c18b3b4':
camera2: Fix shim aspect ratio scaling.
2014-08-16 00:21:56 +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
ec620de00c
am 345efd9a: am 58157586: Merge "Add FeatureGroup to PackageInfo" into lmp-dev
...
* commit '345efd9a6988601e67d3c0202e433144670b5e62':
Add FeatureGroup to PackageInfo
2014-08-15 23:16:50 +00:00
Jeff Sharkey
690881325f
am 61c28588: am a1af0d42: Merge "PackageInstaller API refactoring." into lmp-dev
...
* commit '61c28588f4b8d748c95791446e1ca0ca6f7df060':
PackageInstaller API refactoring.
2014-08-15 23:16:45 +00:00
Robert Greenwalt
18b08ad2b5
am 26ca16ce: am 90e32866: Merge "Configure MTU based on network MTU parameter" into lmp-dev
...
* commit '26ca16ce704d69e36722786586d8e4449dbabe91':
Configure MTU based on network MTU parameter
2014-08-15 22:23:46 +00:00
Jeff Davidson
f206ab9db3
am 8450fe3b: am bffe81a7: Merge "Fix default scorer provisioning." into lmp-dev
...
* commit '8450fe3b1ce69a24e373ebca6302739103f1c03b':
Fix default scorer provisioning.
2014-08-15 22:08:11 +00:00
Adam Lesinski
ab9b1f5b2a
am 5bcfb6b9: am 2fdf2db8: Merge "Fix assumption about DynamicRefTable in aapt" into lmp-dev
...
* commit '5bcfb6b98261c94a6ff33438e6b29ca71bb3c0eb':
Fix assumption about DynamicRefTable in aapt
2014-08-15 22:07:59 +00:00
Sunny Goyal
a4dd2c336f
am 6ba6c6ce: am c4949481: Merge "Returning null when preview image is not available for AppWidgetProviderInfo" into lmp-dev
...
* commit '6ba6c6cecbfe58295c07d6c793aebbc3d9ea2ec2':
Returning null when preview image is not available for AppWidgetProviderInfo
2014-08-15 21:47:45 +00:00
Christopher Tate
a981cfba7b
am 5e6afbc2: am 2c286400: Merge "Tighten restore-at-install behavior" into lmp-dev
...
* commit '5e6afbc2c5dafec254601ac3968a8c26219c91be':
Tighten restore-at-install behavior
2014-08-15 21:47:40 +00:00
Alan Viverette
6a2f703fed
Merge "Scrapping the view at position zero is still position zero" into lmp-dev
2014-08-15 21:23:40 +00:00
Alan Viverette
4771b55d13
Scrapping the view at position zero is still position zero
...
BUG: 16418789
Change-Id: I8334d6b37efa1f853152ef2cea041db69e41d24e
2014-08-15 18:02:23 -07: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
Amith Yamasani
38992b95e8
am e52fb6f4: am a728a418: Merge "Copy certain settings to the managed profile" into lmp-dev
...
* commit 'e52fb6f4df210523946fbc041207438d8264472c':
Copy certain settings to the managed profile
2014-08-15 21:17:26 +00:00
Julia Reynolds
cdf03e4c1c
am 289bbb2d: am 08aeb505: Merge "Apply lockdowns when user restrictions are set." into lmp-dev
...
* commit '289bbb2d827e73893a201f2ecde04f19c86bfc5f':
Apply lockdowns when user restrictions are set.
2014-08-15 21:17:05 +00:00
Narayan Kamath
8da7810224
am 0f575a9e: am 9b0fe82e: am f58fd973: Merge "Fix getPackageInfo for the "android" package in the system server." into lmp-dev
...
* commit '0f575a9e65ee1baa0edcde2e8eaa123958c47870':
Fix getPackageInfo for the "android" package in the system server.
2014-08-15 21:11:16 +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
Narayan Kamath
b7f70bddf3
am 9b0fe82e: am f58fd973: Merge "Fix getPackageInfo for the "android" package in the system server." into lmp-dev
...
* commit '9b0fe82e88a0e1d7e806f9ca7c5966bc009b00ac':
Fix getPackageInfo for the "android" package in the system server.
2014-08-15 20:58:38 +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
Robert Greenwalt
bd431ee5d3
Merge "Configure MTU based on network MTU parameter" into lmp-dev
2014-08-15 19:10:34 +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
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
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
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
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
Andres Morales
6573b4a2d3
am 8c403f56: am cec4f99b: am f099ee6a: Merge "Fix issue where unlock handlers are not properly updated" into lmp-dev
...
* commit '8c403f56cdf9bd0251ef9fefebbe002e09efe740':
Fix issue where unlock handlers are not properly updated
2014-08-15 17:40:04 +00:00
Andres Morales
46ceea564f
am cec4f99b: am f099ee6a: Merge "Fix issue where unlock handlers are not properly updated" into lmp-dev
...
* commit 'cec4f99b1def705ea006256923bbf59306d2a7c0':
Fix issue where unlock handlers are not properly updated
2014-08-15 17:32:09 +00:00
John Spurlock
f77f85ef3a
am c51ac1dc: am e1cc245d: am 0ac3062e: Zen: Downtime now a condition provider, persist conditions.
...
* commit 'c51ac1dcfe2c7391b333c442389c13a02c073064':
Zen: Downtime now a condition provider, persist conditions.
2014-08-15 15:28:16 +00:00
