Commit Graph

41685 Commits

Author SHA1 Message Date
Jeff Sharkey
faee1741db am 97308915: am 5ddccbd2: Merge "Add code cache directory for apps." into lmp-dev
* commit '9730891509b0c7bb50b0b2ecf498c3b993dcef39':
  Add code cache directory for apps.
2014-07-16 17:04:05 +00:00
Jeff Sharkey
50bad3121d am 5ddccbd2: Merge "Add code cache directory for apps." into lmp-dev
* commit '5ddccbd263e50c6c2d3b63ea290e0db661a726f5':
  Add code cache directory for apps.
2014-07-16 17:00:30 +00:00
Jeff Sharkey
d0a2de06a7 Merge "Add code cache directory for apps." into lmp-dev 2014-07-16 16:25:13 +00:00
Alex Klyubin
8f730adf13 am e6078129: am d1c5208b: Merge "No need to explicitly enable TLS-PSK cipher suites." into lmp-dev
* commit 'e607812949c4d2fb733b20a5a172a4b2e5bd227f':
  No need to explicitly enable TLS-PSK cipher suites.
2014-07-16 15:35:44 +00:00
Alex Klyubin
e36542faa6 am d1c5208b: Merge "No need to explicitly enable TLS-PSK cipher suites." into lmp-dev
* commit 'd1c5208bddd14812ae8e7b4f18a3d769e252d268':
  No need to explicitly enable TLS-PSK cipher suites.
2014-07-16 15:31:33 +00:00
Adam Connors
0e96eac397 am bdb9e425: am 7250f656: Merge "Revert "Remove enableSystemApp methods."" into lmp-dev
* commit 'bdb9e425cf90fb05a8d19a4ebdf8454ec7a40655':
  Revert "Remove enableSystemApp methods."
2014-07-16 14:24:33 +00:00
Adam Connors
66f58686c5 am 7250f656: Merge "Revert "Remove enableSystemApp methods."" into lmp-dev
* commit '7250f65642930a6906135ac2ca71090fbe4b52e5':
  Revert "Remove enableSystemApp methods."
2014-07-16 14:20:57 +00:00
Andrew Solovay
d75fd88ee5 am 9053f216: am ebbabf28: am c8fcb3bc: am 57553775: am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs
* commit '9053f216f1d1c5bf4b71281a3de77a665d060cf1':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
2014-07-16 13:59:56 +00:00
Andrew Solovay
a4f56e35a7 am ebbabf28: am c8fcb3bc: am 57553775: am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs
* commit 'ebbabf2858f2080e6c8e5c5558b57259ee15f65b':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
2014-07-16 13:54:41 +00:00
Andrew Solovay
f7cecf8f4b am c8fcb3bc: am 57553775: am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs
* commit 'c8fcb3bcdb71fe16624bea146a67b13c150adb82':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
2014-07-16 13:36:16 +00:00
Andrew Solovay
c8fcb3bcdb am 57553775: am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs
* commit '575537759222e0277c3979e33342407aa7ca1a78':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
2014-07-16 13:29:08 +00:00
Alex Klyubin
09f1c724e3 Merge "No need to explicitly enable TLS-PSK cipher suites." into lmp-dev 2014-07-16 13:12:22 +00:00
Narayan Kamath
bbdbfcc7f6 am cc4b75b8: resolved conflicts for merge of 73083ed1 to lmp-dev-plus-aosp
* commit 'cc4b75b87a7b38fc2c4c746ef97074b4f2b36280':
  Add an internal API to get all asset locales.
2014-07-16 13:09:34 +00:00
Narayan Kamath
4b8e1c6860 resolved conflicts for merge of 73083ed1 to lmp-dev-plus-aosp
Change-Id: I010e48082776070faffe2719d9cb13c307d1dcff
2014-07-16 14:05:55 +01:00
John Spurlock
4cd9c6dd97 am facee9d9: am 798c7ad8: Merge "Zen: handle exit conditions across reboots." into lmp-dev
* commit 'facee9d9f948a8b492b49ba93a444431f758a09e':
  Zen: handle exit conditions across reboots.
2014-07-16 12:59:47 +00:00
Marcin Kosiba
45a3f4b1fc am a9dcfe0e: am 11231acb: Merge "Add more params to WebViewClient.shouldInterceptRequest." into lmp-dev
* commit 'a9dcfe0e9ea0ae92989c2eb599814cadaafa4a9e':
  Add more params to WebViewClient.shouldInterceptRequest.
2014-07-16 12:59:37 +00:00
Ben Murdoch
1521c02894 am 23111c5a: am c50b1104: Plumb temporary view detach calls through WebView.
* commit '23111c5a4f031ca8114b79657348e2fc8dc2a0dd':
  Plumb temporary view detach calls through WebView.
2014-07-16 12:59:33 +00:00
Narayan Kamath
73083ed1e4 am 3c8f8caa: Merge "Add an internal API to get all asset locales."
* commit '3c8f8caaa711c0d025dab85cfdacc7586e75d31a':
  Add an internal API to get all asset locales.
2014-07-16 12:57:02 +00:00
Jeff Sharkey
4ed745d359 Add code cache directory for apps.
This provides a directory where apps can cache compiled or optimized
code generated at runtime.  The platform will delete all files in
this location on both app and platform upgrade.

Bug: 16187224
Change-Id: I641b21d841c436247f35ff235317e3a4ba520441
2014-07-15 22:13:26 -07:00
Jeff Sharkey
6b5dbcbfc5 am 76014649: am 21c0fec8: Merge "Mark resource-only splits as hasCode=false." into lmp-dev
* commit '7601464965dd43b946fa8c0c29aff54da31aa3e5':
  Mark resource-only splits as hasCode=false.
2014-07-16 03:33:00 +00:00
Ben Murdoch
7302f4f8f7 Plumb temporary view detach calls through WebView.
Intercept View#onStartTemporaryDetach/onFinishTemporaryDetach
to handle focus changes correctly.

Bug: 14313621
Change-Id: I92ba2f44359643fee63f30b9c35b1ae4183e4245
2014-07-16 03:28:43 +00:00
Jeff Sharkey
78a130144b Mark resource-only splits as hasCode=false.
PackageManagerService now skips dexopt for split APKs that don't
declare they have code.  Also surface more detailed error messages
in logs.

Bug: 14975160
Change-Id: Ie6078dba724815020cee59b7fc52317e88ca097a
2014-07-15 20:18:39 -07:00
Jeff Sharkey
2c509a774d am beb50dd9: am 5417dd75: Merge "Parse more split APK manifest details." into lmp-dev
* commit 'beb50dd93279b18ebc07827b96a6a406da107af1':
  Parse more split APK manifest details.
2014-07-16 03:00:27 +00:00
Jeff Sharkey
da96e137bc Parse more split APK manifest details.
Allow split APKs to define activities, services, receivers,
providers, and metadata.  However, support for many manifest items
are explicitly omitted.

Only dexopt split APKs that include code.

Bug: 14975160
Change-Id: I2fbf99e2a62328aa2185e5924755af33060282fc
2014-07-15 18:50:00 -07:00
Adam Connors
63602e56bc Merge "Revert "Remove enableSystemApp methods."" into lmp-dev 2014-07-16 01:00:53 +00:00
Adam Connors
655be2a98e Revert "Remove enableSystemApp methods."
We need to go back to uninstalling system apps so we can
re-install non-default system applications through Play.

This reverts commit e3dbcd138c07f2d32ac84229d0a49052cc18d424.

Change-Id: I0a7af094614c4a10800971c82e10571f7312e079
2014-07-16 09:48:43 +00:00
Ruben Brunk
76778cbc7f Merge "camera2: Performance potpourri." 2014-07-16 01:00:53 +00:00
Ruben Brunk
2cdfa261f4 camera2: Performance potpourri.
Bug: 16208403
Bug: 15116722

Fixes many of the performance issues in the Camera2 API and
LEGACY mode CPU path, including:
- Only call getParameters/setParameters when the request has changed.
- Cache Request/Result objects.
- Cache object hashes for long-lived CameraMetadata, TypeReference,
  and Key objects with frequently used hash methods.
- Switch to Command pattern instead of repeated if/equals calls.
  in frequently hit CameraMetadata get/set methods.
- Move string construction for logging behind flags to avoid extra
  StringBuilder calls in frequently acquired lock methods.
- Cache results from frequently used JNI calls in object Builders.

Change-Id: I77bc4a023d4fe8bc46efcf771ff18ee268dcb9a9
2014-07-15 18:21:34 -07:00
John Spurlock
50806fc4ce Zen: handle exit conditions across reboots.
- Use the persisted exit condition (and a new
  persisted exit component) to immediately resubscribe
  to the manual exit condition (if present)
- Fire false immediately for old countdown conditions.
- Add a new zen lens to noman dump, and a bit more info.
- Refresh the current exit condition when reopening the panel.

Bug:15844990
Bug:16212455
Change-Id: I8bfaf1b2a6cf3d8818002a9db5c527ad3aa4c05c
2014-07-16 06:54:35 -04:00
Amith Yamasani
2502d23ade am 8f1d6eeb: am 6053e05a: Merge "App restrictions schema and parser" into lmp-dev
* commit '8f1d6eebaa8dd7c30b3ee318211aacb06603bc0d':
  App restrictions schema and parser
2014-07-16 00:42:08 +00:00
Igor Murashkin
d5b5e99905 am 8950b34f: am 4f0c20d5: camera2: Fix available keys to filter to only supported keys
* commit '8950b34fc5a0211317db8036885ad88d74635f2c':
  camera2: Fix available keys to filter to only supported keys
2014-07-16 00:33:46 +00:00
Alan Viverette
9859d3e500 am 71f269be: am 80403162: Fix hotspot movement on focus change
* commit '71f269bef7e9b75341e6fbe57d26240379bae9d0':
  Fix hotspot movement on focus change
2014-07-16 00:22:57 +00:00
Igor Murashkin
cc542a4e74 camera2: Fix available keys to filter to only supported keys
The following functions are affected:
* CameraCharacteristics#getKeys
* CameraCharacteristics#getAvailableResultKeys
* CameraCharacteristics#getAvailableRequestKeys

The above keys will now only return keys whose tags are set in
android.request.available{Characteristics,Result,Request}Keys

This change makes it possible to detect if a key is guaranteed to be
available at a granular basis (without querying hardwareLevel or
capabilities).

Change-Id: Iaa34e8c24100339c215604ff49035527fae467cd
2014-07-16 00:18:12 +00:00
Alan Viverette
1c28720e7e am 592cbb47: am d3d24578: Merge "Ensure surfaces with insets aren\'t rendered as opaque" into lmp-dev
* commit '592cbb4790ccbf6007c432bd26c351504ae23d89':
  Ensure surfaces with insets aren't rendered as opaque
2014-07-16 00:08:23 +00:00
Alan Viverette
7068c39526 Fix hotspot movement on focus change
BUG: 15726988
Change-Id: I97f88e5f7e404ecfcd5c254fddd18c8f6616064e
2014-07-16 00:06:14 +00:00
Chris Craik
5aa7779522 am 4ae1b2c0: am fc5ab918: Merge "Avoid arc for edge effect drawing." into lmp-dev
* commit '4ae1b2c047779e6e017fc9a098878334a5f9414b':
  Avoid arc for edge effect drawing.
2014-07-15 23:17:47 +00:00
George Mount
c0c3067add am 290832f9: am 991b21e5: Fix NPE during construction from XML.
* commit '290832f908b1967285e0d1f91fa42896feb6f1bb':
  Fix NPE during construction from XML.
2014-07-15 22:43:23 +00:00
George Mount
e3b50aecfd Fix NPE during construction from XML.
Bug 16322214

Change-Id: Ie2811a54880ab60b607ae29d7df04b0636e67197
2014-07-15 22:24:58 +00:00
Dianne Hackborn
8e0448c287 am 2bcf0ac4: am 8f3aa373: Fix issue #15681802: Missing RESET:TIME in complete battery histories
* commit '2bcf0ac4470f4647e506174e1f2173e931352987':
  Fix issue #15681802: Missing RESET:TIME in complete battery histories
2014-07-15 22:22:30 +00:00
Ashish Sharma
9da1241bbe am 226b7f0b: am 330d0a1c: Report wakelock time in checkin stats in ms. Bump version.
* commit '226b7f0b6826284f1b66ca4abdce7f2e0c3d221c':
  Report wakelock time in checkin stats in ms. Bump version.
2014-07-15 22:22:21 +00:00
Fabrice Di Meglio
74fa6b7e6b am f4977d53: am c9591581: Update DatePicker widget and its related dialog
* commit 'f4977d536d5331d2e0e60d6000a0ac904a83b27b':
  Update DatePicker widget and its related dialog
2014-07-15 22:04:31 +00:00
Deepanshu Gupta
cc0c78c98b am dbc322c7: am 0f71531f: Merge "Support Locale.toLanguageTag on Java 6" into lmp-dev
* commit 'dbc322c7b6d2da8e4dc24a85d8c2039a947e27ae':
  Support Locale.toLanguageTag on Java 6
2014-07-15 22:04:03 +00:00
Chris Wren
57e6b8cfac am 59afac2b: am 30f80bd2: Merge "Implement application-level high priority bit." into lmp-dev
* commit '59afac2bed67903485b8f75053c4e39c179db0c1':
  Implement application-level high priority bit.
2014-07-15 22:03:30 +00:00
Dianne Hackborn
fdb1956ff7 Fix issue #15681802: Missing RESET:TIME in complete battery histories
But wait, there's more!

- Keep track of sync durations in the aggregated stats.
- Add events for users that are running and in the foreground.
- Rework the activity manager's tracking of stuff using
  battery in the background to be based on proc stats, which
  allows it to be better about determing when it should reset
  its tracking of background work.
- Also add tracking of scheduled job execution, like we are
  doing for syncs.
- And once I started hooking battery stats in to
  JobSchedulerService, I found a few things I couldn't stop myself
  from changing: (1) make it very explicit that it doesn't start
  scheduling jobs until we have reached the point in system boot
  where third party apps are allowed to run, and (2) adjust
  the various for loops to not use iterators.

Change-Id: I69d812e27bcfee9e58a614f0f6b1c7545d7530b1
2014-07-15 14:48:48 -07:00
Ashish Sharma
213bb2fd4d Report wakelock time in checkin stats in ms. Bump version.
Change-Id: Icd5cebb3434572cb226ef018629fcfca8bfc08e8
2014-07-15 21:33:22 +00:00
Marcin Kosiba
bce81bd03d Merge "Add more params to WebViewClient.shouldInterceptRequest." into lmp-dev 2014-07-15 20:46:43 +00:00
Marcin Kosiba
d72e7ba1c0 Add more params to WebViewClient.shouldInterceptRequest.
This changes shouldInterceptRequest to take an object containing the
following new parameters: isMainFrame, hasUserGesture, method, headers.
This also lets the embedder specify the following additional properties
of the response: status code, response phrase, headers.

BUG: 7589347
Change-Id: Id922c5e7023eb067db871e6f782f599492a2428f
2014-07-15 21:31:44 -07:00
Chris Craik
62cc377c03 Merge "Avoid arc for edge effect drawing." into lmp-dev 2014-07-15 20:46:43 +00:00
Chris Craik
8eeb729cf2 Avoid arc for edge effect drawing.
b/16131698

Tessellation doesn't support joins, which filled arcs have.

Change-Id: I566d0c1c39f058bb641aa24d2a4488b0aaa1b454
2014-07-15 15:36:32 -07:00
Jeff Sharkey
795903e83d Merge "Mark resource-only splits as hasCode=false." into lmp-dev 2014-07-15 20:39:52 +00:00