OSDN Git Service

android-x86/frameworks-base.git
9 years agoMark apps as not-idle at least once
Amith Yamasani [Sat, 4 Apr 2015 00:22:36 +0000 (17:22 -0700)]
Mark apps as not-idle at least once

On a fresh boot or update to M, mark existing apps
as being used if there is no existing entry in the
usage stats. On subsequent OTAs, make sure that at
least the new system apps are marked as used.

Reduce idle threshold to 1 day.

Bug: 20066058
Change-Id: I9a273c051d04432877bacd381c85bf6e721c1a85

9 years agoMerge "Throttle jobs for idle apps"
Amith Yamasani [Fri, 3 Apr 2015 20:26:38 +0000 (20:26 +0000)]
Merge "Throttle jobs for idle apps"

9 years agoThrottle jobs for idle apps
Amith Yamasani [Wed, 4 Mar 2015 17:56:14 +0000 (09:56 -0800)]
Throttle jobs for idle apps

First pass at delaying jobs from apps that are idle.

TODO: Throttle syncs
TODO: Provide a periodic point at which apps are checked for idleness.

Apps that switch to foreground process state are tracked by UsageStats
as an INTERACTION event that affects the last-used timestamp.

JobScheduler's logic for when an app is ready is trumped by the idleness
of the app, and only if the battery is not charging. When charging state
changes, we update the idle state of all the tracked jobs.

android package is whitelisted.

Bug: 20066058
Change-Id: I0a0acb517b100a5c7b11e3f435f4141375f3451f

9 years agoMerge "Add group scaling factor into stroke width."
ztenghui [Fri, 3 Apr 2015 20:08:56 +0000 (20:08 +0000)]
Merge "Add group scaling factor into stroke width."

9 years agoMerge "Zen: Changes to support new priority settings."
John Spurlock [Fri, 3 Apr 2015 20:07:54 +0000 (20:07 +0000)]
Merge "Zen: Changes to support new priority settings."

9 years agoMerge "Volume: Port safety warning over to new dialog."
John Spurlock [Fri, 3 Apr 2015 20:07:31 +0000 (20:07 +0000)]
Merge "Volume: Port safety warning over to new dialog."

9 years agoresolved conflicts for merge of b068f162 to master
Alex Klyubin [Fri, 3 Apr 2015 20:01:09 +0000 (13:01 -0700)]
resolved conflicts for merge of b068f162 to master

Change-Id: I5bc234e1da047880d3437a861ff93474a9797e18

9 years agoam 54d583c1: am e797eb2e: am 377885e1: Merge "Mark all test keys as no auth required"
Chad Brubaker [Fri, 3 Apr 2015 19:55:38 +0000 (19:55 +0000)]
am 54d583c1: am e797eb2e: am 377885e1: Merge "Mark all test keys as no auth required"

* commit '54d583c148fd14034afc751ad70ab772de55eb92':
  Mark all test keys as no auth required

9 years agoam c869ac1b: am ec029e55: am b292e49b: Merge "Obtain SPI without using Reflection."
Alex Klyubin [Fri, 3 Apr 2015 19:55:22 +0000 (19:55 +0000)]
am c869ac1b: am ec029e55: am b292e49b: Merge "Obtain SPI without using Reflection."

* commit 'c869ac1b7d163282ffdebf4ce9b32c479766f52d':
  Obtain SPI without using Reflection.

9 years agoZen: Changes to support new priority settings.
John Spurlock [Fri, 3 Apr 2015 17:47:14 +0000 (13:47 -0400)]
Zen: Changes to support new priority settings.

Bug: 20064962
Change-Id: Iac3444c0a55830d5e5459e26c2172d974db600d6

9 years agoMerge "AAPT2 statically link libz on Windows builds"
Adam Lesinski [Fri, 3 Apr 2015 19:45:44 +0000 (19:45 +0000)]
Merge "AAPT2 statically link libz on Windows builds"

9 years agoAAPT2 statically link libz on Windows builds
Adam Lesinski [Fri, 3 Apr 2015 19:44:40 +0000 (12:44 -0700)]
AAPT2 statically link libz on Windows builds

Change-Id: I2abf47273173c470c04e00a54aa619fe1ce0e745

9 years agoam 376b23e6: am 08963653: Merge "Rename KeymasterException to KeyStoreException."
Alex Klyubin [Fri, 3 Apr 2015 19:43:43 +0000 (19:43 +0000)]
am 376b23e6: am 08963653: Merge "Rename KeymasterException to KeyStoreException."

* commit '376b23e6fdda35cc6fa61ea9a3c10d109fe2d601':
  Rename KeymasterException to KeyStoreException.

9 years agoam e797eb2e: am 377885e1: Merge "Mark all test keys as no auth required"
Chad Brubaker [Fri, 3 Apr 2015 19:43:38 +0000 (19:43 +0000)]
am e797eb2e: am 377885e1: Merge "Mark all test keys as no auth required"

* commit 'e797eb2eea885f086465e47efc464adcd0d7acea':
  Mark all test keys as no auth required

9 years agoam ec029e55: am b292e49b: Merge "Obtain SPI without using Reflection."
Alex Klyubin [Fri, 3 Apr 2015 19:43:33 +0000 (19:43 +0000)]
am ec029e55: am b292e49b: Merge "Obtain SPI without using Reflection."

* commit 'ec029e551641982294d9b346b741c84d2510d670':
  Obtain SPI without using Reflection.

9 years agoMerge "Fix windows build of AAPT2"
Adam Lesinski [Fri, 3 Apr 2015 19:33:52 +0000 (19:33 +0000)]
Merge "Fix windows build of AAPT2"

9 years agoMerge "Add private flag PRIVATE_FLAG_HAS_DOMAIN_URLS to ApplicationInfo"
Fabrice Di Meglio [Fri, 3 Apr 2015 19:33:41 +0000 (19:33 +0000)]
Merge "Add private flag PRIVATE_FLAG_HAS_DOMAIN_URLS to ApplicationInfo"

9 years agoam 08963653: Merge "Rename KeymasterException to KeyStoreException."
Alex Klyubin [Fri, 3 Apr 2015 19:33:27 +0000 (19:33 +0000)]
am 08963653: Merge "Rename KeymasterException to KeyStoreException."

* commit '08963653fc9434d2f50d3c8e64c757138efd102e':
  Rename KeymasterException to KeyStoreException.

9 years agoam 377885e1: Merge "Mark all test keys as no auth required"
Chad Brubaker [Fri, 3 Apr 2015 19:33:21 +0000 (19:33 +0000)]
am 377885e1: Merge "Mark all test keys as no auth required"

* commit '377885e1e6a4efc727060cca241fea29114315d5':
  Mark all test keys as no auth required

9 years agoam b292e49b: Merge "Obtain SPI without using Reflection."
Alex Klyubin [Fri, 3 Apr 2015 19:33:14 +0000 (19:33 +0000)]
am b292e49b: Merge "Obtain SPI without using Reflection."

* commit 'b292e49b32fa321e59bf88c68e4c4d8c139645dd':
  Obtain SPI without using Reflection.

9 years agoFix windows build of AAPT2
Adam Lesinski [Fri, 3 Apr 2015 19:08:26 +0000 (12:08 -0700)]
Fix windows build of AAPT2

Change-Id: Ib8e1a4322510b582e9600a08d3118842c9abc73c

9 years agoAdd private flag PRIVATE_FLAG_HAS_DOMAIN_URLS to ApplicationInfo
Fabrice Di Meglio [Wed, 1 Apr 2015 22:58:47 +0000 (15:58 -0700)]
Add private flag PRIVATE_FLAG_HAS_DOMAIN_URLS to ApplicationInfo

This is for supporting Settings UX and Domain URLs

- the new PRIVATE_FLAG_HAS_DOMAIN_URLS flag will be set by
generateApplicationInfo() when the Activity is said to have some
IntentFilter with a VIEW action and a http / https data URI

- code cleaning for args passing
- also add a new constant for the MetricsLogger

Change-Id: I5c9762fc2c4a9b46c0e255b9a23bffd70fae40c7

9 years agoMerge "Rename KeymasterException to KeyStoreException."
Alex Klyubin [Fri, 3 Apr 2015 19:13:49 +0000 (19:13 +0000)]
Merge "Rename KeymasterException to KeyStoreException."

9 years agoMerge "Mark all test keys as no auth required"
Chad Brubaker [Fri, 3 Apr 2015 19:13:18 +0000 (19:13 +0000)]
Merge "Mark all test keys as no auth required"

9 years agoMerge "Obtain SPI without using Reflection."
Alex Klyubin [Fri, 3 Apr 2015 19:13:15 +0000 (19:13 +0000)]
Merge "Obtain SPI without using Reflection."

9 years agoMerge "Add fingerprint-specific API to KeyPairGeneratorSpec."
Alex Klyubin [Fri, 3 Apr 2015 19:12:16 +0000 (19:12 +0000)]
Merge "Add fingerprint-specific API to KeyPairGeneratorSpec."

9 years agoObtain SPI without using Reflection.
Alex Klyubin [Fri, 3 Apr 2015 16:44:39 +0000 (09:44 -0700)]
Obtain SPI without using Reflection.

Bug: 18088752
Change-Id: I76d42e17f5f28af6fd9a96ee812d286f6c6a085b

9 years agoMerge "audio: add AudioFormat.ENCODING_DTS"
Phil Burk [Fri, 3 Apr 2015 18:55:03 +0000 (18:55 +0000)]
Merge "audio: add AudioFormat.ENCODING_DTS"

9 years agoCamera2: Wire depth formats into StreamConfigurationMap
Eino-Ville Talvala [Thu, 5 Mar 2015 23:42:49 +0000 (15:42 -0800)]
Camera2: Wire depth formats into StreamConfigurationMap

Change-Id: I9046b60dca83d090efd9c74c98bfdfebdeae8751

9 years agoMerge changes from topic 'assist'
Jorim Jaggi [Fri, 3 Apr 2015 18:26:28 +0000 (18:26 +0000)]
Merge changes from topic 'assist'

* changes:
  Add test assist to implement motion study
  Implement new assist gesture and motion
  Add flag to voice interactor for supporting assist gesture
  Add more internal API's for assist
  Add ability to start voice interaction session directly

9 years agoam 1327fa9e: am 511eb660: am 6aed9ec1: Merge "[RenderScript] update exception reporti...
Miao Wang [Fri, 3 Apr 2015 18:18:01 +0000 (18:18 +0000)]
am 1327fa9e: am 511eb660: am 6aed9ec1: Merge "[RenderScript] update exception reporting for copyTo() after autoPadding added."

* commit '1327fa9eb155eb57fe24a8aa90a18f57d706e86b':
  [RenderScript] update exception reporting for copyTo() after autoPadding added.

9 years agoAdd test assist to implement motion study
Jorim Jaggi [Wed, 1 Apr 2015 20:37:39 +0000 (13:37 -0700)]
Add test assist to implement motion study

This change introduces another test VoiceInteractionService, Assist,
to test the full SystemUI -> assist layer motion when invoking
assist.

The old assist test project was renamed to LegacyAssist.

Change-Id: Iddf8a36a76083625f8aa4faecef1930e9952d05b

9 years agoImplement new assist gesture and motion
Jorim Jaggi [Wed, 1 Apr 2015 22:13:03 +0000 (15:13 -0700)]
Implement new assist gesture and motion

Change-Id: Ic8ba18c200058062f4d38ac4226d3516af3d3df0

9 years agoAdd flag to voice interactor for supporting assist gesture
Jorim Jaggi [Thu, 2 Apr 2015 18:21:39 +0000 (11:21 -0700)]
Add flag to voice interactor for supporting assist gesture

Add an additional flag to the voice-interaction-service declaration
so it can indicate whether it is able to handle the assist gesture.
Use that information in SystemUI so it only starts the voice
interaction session if the service is able to support it.

Change-Id: I62b035ce4f4cf06ee6e7eb0ddc4bf5edbc0e6737

9 years agoAdd more internal API's for assist
Jorim Jaggi [Wed, 1 Apr 2015 18:18:57 +0000 (11:18 -0700)]
Add more internal API's for assist

- When starting a voice interaction session from SysUI, a callback
can be passed to know when voice interaction has successfully started
- Add a new window type for the voice interaction starting window,
which resides behind the voice interaction layer.
- SystemUI now also inspects the voice interaction service to get the
logo asset for the starting window.
- Make VoiceInteractionSession window fullscreen, to accomodate for
the visuals.

Change-Id: If8c3c445e8b39841f48e8d153e6d1ba81e447286

9 years agoAdd ability to start voice interaction session directly
Jorim Jaggi [Thu, 2 Apr 2015 18:46:28 +0000 (11:46 -0700)]
Add ability to start voice interaction session directly

Add internal API's for SystemUI to start a voice interaction session
directly, without using an intent.

Make the assist gesture use that ability, if available.

Change-Id: I88ce3c7514714eb45666884847193585a07417a9

9 years agoam 511eb660: am 6aed9ec1: Merge "[RenderScript] update exception reporting for copyTo...
Miao Wang [Fri, 3 Apr 2015 18:07:11 +0000 (18:07 +0000)]
am 511eb660: am 6aed9ec1: Merge "[RenderScript] update exception reporting for copyTo() after autoPadding added."

* commit '511eb6609291d482266c0efce73bdf60509e86b8':
  [RenderScript] update exception reporting for copyTo() after autoPadding added.

9 years agoam 6aed9ec1: Merge "[RenderScript] update exception reporting for copyTo() after...
Miao Wang [Fri, 3 Apr 2015 17:55:42 +0000 (17:55 +0000)]
am 6aed9ec1: Merge "[RenderScript] update exception reporting for copyTo() after autoPadding added."

* commit '6aed9ec1b85ff1a8a39c4ec091a017f79413ead0':
  [RenderScript] update exception reporting for copyTo() after autoPadding added.

9 years agoMerge "[RenderScript] update exception reporting for copyTo() after autoPadding added."
Miao Wang [Fri, 3 Apr 2015 17:38:13 +0000 (17:38 +0000)]
Merge "[RenderScript] update exception reporting for copyTo() after autoPadding added."

9 years agoMerge "Ensuring that Recents' orientation matches the app behind it."
Winson Chung [Fri, 3 Apr 2015 17:33:19 +0000 (17:33 +0000)]
Merge "Ensuring that Recents' orientation matches the app behind it."

9 years agoEnsuring that Recents' orientation matches the app behind it.
Winson Chung [Fri, 3 Apr 2015 17:30:57 +0000 (10:30 -0700)]
Ensuring that Recents' orientation matches the app behind it.

Bug: 18935635
Change-Id: Idef7f3bced53811c45648f7ee8f6b612df89a231

9 years agoMerge "Add per-interval interpolation support for keyframe in xml resources"
Doris Liu [Fri, 3 Apr 2015 17:17:07 +0000 (17:17 +0000)]
Merge "Add per-interval interpolation support for keyframe in xml resources"

9 years agoMerge "Making the screenshot filename smaller to fix issue on certain platforms."
Winson Chung [Fri, 3 Apr 2015 17:14:43 +0000 (17:14 +0000)]
Merge "Making the screenshot filename smaller to fix issue on certain platforms."

9 years agoMerge "Ensuring that we reload a widget that was updated in another orientation."
Winson Chung [Fri, 3 Apr 2015 17:14:35 +0000 (17:14 +0000)]
Merge "Ensuring that we reload a widget that was updated in another orientation."

9 years agoMaking the screenshot filename smaller to fix issue on certain platforms.
Winson Chung [Fri, 3 Apr 2015 17:01:40 +0000 (10:01 -0700)]
Making the screenshot filename smaller to fix issue on certain platforms.

Bug: 11574102
Change-Id: Ia71e600a6d484bc36624ae959841ae0b3f23697a

9 years agoEnsuring that we reload a widget that was updated in another orientation.
Winson Chung [Fri, 3 Apr 2015 01:16:02 +0000 (18:16 -0700)]
Ensuring that we reload a widget that was updated in another orientation.

Bug: 20044969
Change-Id: Iecdbe01d06c44653781ddef749e319f6b5b8afa1

9 years agoMerge "Add quick and dirty async AssistStructure building."
Dianne Hackborn [Fri, 3 Apr 2015 16:46:53 +0000 (16:46 +0000)]
Merge "Add quick and dirty async AssistStructure building."

9 years agoMerge "Do not log an error when app restriction file does not exist"
Fyodor Kupolov [Fri, 3 Apr 2015 16:43:40 +0000 (16:43 +0000)]
Merge "Do not log an error when app restriction file does not exist"

9 years agoDo not log an error when app restriction file does not exist
Fyodor Kupolov [Thu, 2 Apr 2015 19:42:13 +0000 (12:42 -0700)]
Do not log an error when app restriction file does not exist

Bug: 20040207
Change-Id: Ibd257388a185020258e36bddf5b451dc24c0b7ee

9 years ago[RenderScript] update exception reporting for copyTo() after
Miao Wang [Fri, 3 Apr 2015 16:15:39 +0000 (09:15 -0700)]
[RenderScript] update exception reporting for copyTo() after
autoPadding added.

 - This CL fixes recent CTS failures about copyPadded after
   lmp-mr1-dev changes pushed to aosp.

Change-Id: Ica1f4fd934cd83ca4357ea7e7c82dcc7f844b689

9 years agoam 48d6a96b: (-s ours) am fce4220b: am 5fd6b139: am 4a7967ad: am f61aee97: Merge...
Wale Ogunwale [Fri, 3 Apr 2015 14:52:45 +0000 (14:52 +0000)]
am 48d6a96b: (-s ours) am fce4220b: am 5fd6b139: am 4a7967ad: am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev

* commit '48d6a96b2bbd0ec4c4850dd488c6cba3c0b6371f':
  [DO NOT MERGE] Fixed NPE when trying to animate a window without display

9 years agoam 30c688da: am 031898df: am 3d8b7f4d: Merge "Support for storing OAT files in app...
Fyodor Kupolov [Fri, 3 Apr 2015 14:52:14 +0000 (14:52 +0000)]
am 30c688da: am 031898df: am 3d8b7f4d: Merge "Support for storing OAT files in app directory"

* commit '30c688da8bd2b3320446a06424e1cc57b693522a':
  Support for storing OAT files in app directory

9 years agoam fd395ce7: am d0077829: am fb397cf8: (-s ours) Merge "Frameworks/base: Support...
Simon Wilson [Fri, 3 Apr 2015 14:51:51 +0000 (14:51 +0000)]
am fd395ce7: am d0077829: am fb397cf8: (-s ours) Merge "Frameworks/base: Support dex2oat threads system property" into lmp-mr1-modular-dev

* commit 'fd395ce7f33bda1e4ff72bebcc4c0b4e56b8232d':
  Frameworks/base: Support dex2oat threads system property

9 years agoMerge "Store the device initializer componentname in addition to package."
Julia Reynolds [Fri, 3 Apr 2015 14:30:17 +0000 (14:30 +0000)]
Merge "Store the device initializer componentname in addition to package."

9 years agoVolume: Port safety warning over to new dialog.
John Spurlock [Fri, 3 Apr 2015 04:00:12 +0000 (00:00 -0400)]
Volume: Port safety warning over to new dialog.

And remove obsolete "muted by <x>" disablement.

Bug: 19260237
Change-Id: I17dc6d5761aad9ce70cc5aad054489549113e15e

9 years agoMerge "Remove debugging for bug 19823482."
Olawale Ogunwale [Fri, 3 Apr 2015 14:22:29 +0000 (14:22 +0000)]
Merge "Remove debugging for bug 19823482."

9 years agoStore the device initializer componentname in addition to package.
Julia Reynolds [Thu, 2 Apr 2015 12:49:47 +0000 (08:49 -0400)]
Store the device initializer componentname in addition to package.

This removes ambiguity about which component in the initializer
package handles device initialization when setting up secondary users.
Bug: 19992262

Change-Id: I2e48168907725a56cd05d0b51c9f28b34fa28d1a

9 years agoMerge "aapt2: fix definition of G in Util.h"
Greg Hackmann [Fri, 3 Apr 2015 04:03:51 +0000 (04:03 +0000)]
Merge "aapt2: fix definition of G in Util.h"

9 years agoaapt2: fix definition of G in Util.h
Greg Hackmann [Fri, 3 Apr 2015 03:23:22 +0000 (20:23 -0700)]
aapt2: fix definition of G in Util.h

Change-Id: Icbefa425cf543f130deabab9e2e2e6c13ab672d3
Signed-off-by: Greg Hackmann <ghackmann@google.com>
9 years agoRemove debugging for bug 19823482.
Craig Mautner [Fri, 3 Apr 2015 03:22:54 +0000 (20:22 -0700)]
Remove debugging for bug 19823482.

Change-Id: Ibedfb3353e6f7f64e39ad076b329d9cd9657fe5f

9 years agoMerge "Zen: Add a new level: alarms-only."
John Spurlock [Fri, 3 Apr 2015 03:03:45 +0000 (03:03 +0000)]
Merge "Zen: Add a new level: alarms-only."

9 years agoZen: Add a new level: alarms-only.
John Spurlock [Thu, 2 Apr 2015 21:41:21 +0000 (17:41 -0400)]
Zen: Add a new level: alarms-only.

Like no-interruptions, but allows alarms.

Bug: 19260237
Change-Id: I36bf0a333362256c8e54cd83992cb46c3bcb7f69

9 years agoAdd quick and dirty async AssistStructure building.
Dianne Hackborn [Fri, 3 Apr 2015 01:25:35 +0000 (18:25 -0700)]
Add quick and dirty async AssistStructure building.

New APIs on ViewAssistStructure all the app to request to
build a sub-tree asynchronously and indicate when it is done
with that.  The overall AssistStructure is now only flattened
and transfered on-demand, when the app receiving it requests
its data -- and at that point we can wait for any asynchronous
building to complete.

New AsyncStructure view is a very simple example of using this
to asynchronously build a child view.

Change-Id: I14f9199bee64915ad3dc80b2190916ec874308af

9 years agoMerge "TIF: Add time shift APIs."
Dongwon Kang [Fri, 3 Apr 2015 01:37:41 +0000 (01:37 +0000)]
Merge "TIF: Add time shift APIs."

9 years agoMerge "Refactor KeySet code."
dcashman [Fri, 3 Apr 2015 00:52:49 +0000 (00:52 +0000)]
Merge "Refactor KeySet code."

9 years agoam fce4220b: am 5fd6b139: am 4a7967ad: am f61aee97: Merge "[DO NOT MERGE] Fixed NPE...
Wale Ogunwale [Fri, 3 Apr 2015 00:46:09 +0000 (00:46 +0000)]
am fce4220b: am 5fd6b139: am 4a7967ad: am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev

* commit 'fce4220b88006a1e626fc4c63d8bd785d465965a':
  [DO NOT MERGE] Fixed NPE when trying to animate a window without display

9 years agoam 5fd6b139: am 4a7967ad: am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying...
Wale Ogunwale [Fri, 3 Apr 2015 00:36:56 +0000 (00:36 +0000)]
am 5fd6b139: am 4a7967ad: am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev

* commit '5fd6b139033bcaab52921473ab3998725e157002':
  [DO NOT MERGE] Fixed NPE when trying to animate a window without display

9 years agoam 4a7967ad: am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate...
Wale Ogunwale [Fri, 3 Apr 2015 00:26:49 +0000 (00:26 +0000)]
am 4a7967ad: am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev

* commit '4a7967ad9ac76d8b9d6285bc367c33d1b6c83235':
  [DO NOT MERGE] Fixed NPE when trying to animate a window without display

9 years agoam f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without...
Wale Ogunwale [Fri, 3 Apr 2015 00:15:26 +0000 (00:15 +0000)]
am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev

* commit 'f61aee97adf4e543e82289511c6127bcfa53151c':
  [DO NOT MERGE] Fixed NPE when trying to animate a window without display

9 years agoMerge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display"...
Wale Ogunwale [Fri, 3 Apr 2015 00:07:03 +0000 (00:07 +0000)]
Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev

9 years agoMerge "AAPT2"
Adam Lesinski [Fri, 3 Apr 2015 00:06:31 +0000 (00:06 +0000)]
Merge "AAPT2"

9 years agoAAPT2
Adam Lesinski [Fri, 14 Nov 2014 22:48:12 +0000 (14:48 -0800)]
AAPT2

First checking of AAPT2. The individual phases of AAPT2 work, but there
are some missing pieces.

For early testing we are missing:
- Need to properly mark file references and include them in package
- Need to package into zip

Final AAPT for apps we are missing:
- Need to crush PNGs
- Need to parse 9-patches
- Need to validate all of AndroidManifest.xml
- Need to write align method to align resource tables for splits.

Final AAPT for apps + system we are missing:
- Need to handle overlays
- Need to store comments for R file
- Need to handle --shared-lib (dynamic references too).

New AAPT features coming:
- Need to import compiled libraries
    - Name mangling
    - R file generation for library code

Change-Id: I95f8a63581b81a1f424ae6fb2c373c883b72c18d

9 years agoMerge "Do not clear a shared user's permissions on an app install."
Svetoslav [Thu, 2 Apr 2015 23:55:20 +0000 (23:55 +0000)]
Merge "Do not clear a shared user's permissions on an app install."

9 years agoDo not clear a shared user's permissions on an app install.
Svetoslav [Thu, 2 Apr 2015 23:51:55 +0000 (16:51 -0700)]
Do not clear a shared user's permissions on an app install.

When regranting permissions for an app during an install if
that app is in a shared user we should not clear the permissions
as the permissions for the shared user are additive and go away
when apps requesting them are uninstalled.

bug:20050689

Change-Id: I82aa70669fc25a45e7020a1545b093db5525f5cf

9 years agoMerge "Fix resource type annotations for obtainStyledAttributes"
Tor Norbye [Thu, 2 Apr 2015 23:45:20 +0000 (23:45 +0000)]
Merge "Fix resource type annotations for obtainStyledAttributes"

9 years ago[DO NOT MERGE] Fixed NPE when trying to animate a window without display
Wale Ogunwale [Thu, 2 Apr 2015 23:13:57 +0000 (16:13 -0700)]
[DO NOT MERGE] Fixed NPE when trying to animate a window without display

In some cases it is possible for the AppToken.allAppWindows list to
get out of sync with the list of windows known to WMS if the client
doesn't call Session.remove(Window). This can lead to an NPE when
the animation threads runs and the display for the window has been
removed.

Bug: 19972099
Change-Id: Ifdf9ff2364b96757bba0539394c4a682f64577c9

9 years agoam 031898df: am 3d8b7f4d: Merge "Support for storing OAT files in app directory"
Fyodor Kupolov [Thu, 2 Apr 2015 23:38:19 +0000 (23:38 +0000)]
am 031898df: am 3d8b7f4d: Merge "Support for storing OAT files in app directory"

* commit '031898dfd2dd734724d61e447a8ed61cc7f07d5c':
  Support for storing OAT files in app directory

9 years agoAdd per-interval interpolation support for keyframe in xml resources
Doris Liu [Wed, 1 Apr 2015 17:27:40 +0000 (10:27 -0700)]
Add per-interval interpolation support for keyframe in xml resources

Bug: 19913234
Change-Id: Ie46af02b2db3dad6ace667480aa556e0f645d278

9 years agoam 3d8b7f4d: Merge "Support for storing OAT files in app directory"
Fyodor Kupolov [Thu, 2 Apr 2015 23:27:38 +0000 (23:27 +0000)]
am 3d8b7f4d: Merge "Support for storing OAT files in app directory"

* commit '3d8b7f4d50c2f7c64ec4e5874fd95cf837ddc12e':
  Support for storing OAT files in app directory

9 years agoMerge "Add Paint.hasGlyph method"
Raph Levien [Thu, 2 Apr 2015 23:27:20 +0000 (23:27 +0000)]
Merge "Add Paint.hasGlyph method"

9 years agoAdd Paint.hasGlyph method
Raph Levien [Wed, 1 Apr 2015 21:41:21 +0000 (14:41 -0700)]
Add Paint.hasGlyph method

This patch adds a method to determine whether a typeface has a glyph
to support a particular Unicode character or sequence.

The implementation is based on shaping the text and checking for the
presence of .notdef glyphs, and counting the number of glyphs in the
ligature case. In the case of variation selector control characters, it
currently just returns false because there is no variation selector
support yet (Mongolian Free Variation Selectors work because they're
shaped with GSUB instead).

Change-Id: I8ee4ae0d6e81a0ac57f961eb02dcc35aabd87042

9 years agoMerge "Clarify settings update code."
Jeff Brown [Thu, 2 Apr 2015 23:12:50 +0000 (23:12 +0000)]
Merge "Clarify settings update code."

9 years agoam d0077829: am fb397cf8: (-s ours) Merge "Frameworks/base: Support dex2oat threads...
Simon Wilson [Thu, 2 Apr 2015 23:12:23 +0000 (23:12 +0000)]
am d0077829: am fb397cf8: (-s ours) Merge "Frameworks/base: Support dex2oat threads system property" into lmp-mr1-modular-dev

* commit 'd007782986a8b4b90ab622339749271993379839':
  Frameworks/base: Support dex2oat threads system property

9 years agoMerge "Support for storing OAT files in app directory"
Fyodor Kupolov [Thu, 2 Apr 2015 23:11:10 +0000 (23:11 +0000)]
Merge "Support for storing OAT files in app directory"

9 years agoAdd group scaling factor into stroke width.
ztenghui [Wed, 1 Apr 2015 23:38:44 +0000 (16:38 -0700)]
Add group scaling factor into stroke width.

Originally, stroke width is independent of group scaling.
But that is a bug and causing animation trouble.

b/19501782

Change-Id: I33d5e44f2f8b2a82fee1a5a326223a39aaffa86c

9 years agoam fb397cf8: (-s ours) Merge "Frameworks/base: Support dex2oat threads system propert...
Simon Wilson [Thu, 2 Apr 2015 23:04:25 +0000 (23:04 +0000)]
am fb397cf8: (-s ours) Merge "Frameworks/base: Support dex2oat threads system property" into lmp-mr1-modular-dev

* commit 'fb397cf827d2f0c2e1a2aca496c75752da11bc3f':
  Frameworks/base: Support dex2oat threads system property

9 years agoMerge "Revert "Revert "Use AVD for checkbox animation."""
Tenghui Zhu [Thu, 2 Apr 2015 22:59:17 +0000 (22:59 +0000)]
Merge "Revert "Revert "Use AVD for checkbox animation."""

9 years agoRename KeymasterException to KeyStoreException.
Alex Klyubin [Thu, 2 Apr 2015 22:53:46 +0000 (15:53 -0700)]
Rename KeymasterException to KeyStoreException.

The code in question talks to KeyStore which returns error codes
which are a mix of keystore and keymaster error codes. To better
match the layering of KeyStore on top of keystore and keymaster,
this CL renames KeymasterException into KeyStoreException. It also
adds human-readable error messages to exceptions raised by keystore
rather than keymaster (e.g., key not found).

Bug: 18088752
Change-Id: I4cd1235e16518c9f2e8c5557a457774c6e687b88

9 years agoMerge "Add compat path for restore underflow"
Chris Craik [Thu, 2 Apr 2015 22:38:48 +0000 (22:38 +0000)]
Merge "Add compat path for restore underflow"

9 years agoAdd compat path for restore underflow
Chris Craik [Thu, 2 Apr 2015 22:28:08 +0000 (15:28 -0700)]
Add compat path for restore underflow

bug:19829784

Change-Id: Ia761664208ab80c055ca11174db3ddc74457b92b

9 years agoAdd fingerprint-specific API to KeyPairGeneratorSpec.
Alex Klyubin [Thu, 2 Apr 2015 22:15:27 +0000 (15:15 -0700)]
Add fingerprint-specific API to KeyPairGeneratorSpec.

This is identical to the existing API in KeyStoreParameter and
KeyGeneratorSpec.

Bug: 18088752
Change-Id: I8aad4fdeb858cc9586f46d5a81561505914ac334

9 years agoam 58031d5e: am 378df98e: am 3cc9e5d6: Merge "Improve the AndroidKeyStore-backed...
Alex Klyubin [Thu, 2 Apr 2015 22:02:45 +0000 (22:02 +0000)]
am 58031d5e: am 378df98e: am 3cc9e5d6: Merge "Improve the AndroidKeyStore-backed HMAC state machine."

* commit '58031d5eb5531f8bc45ac1789ea1cc9134591358':
  Improve the AndroidKeyStore-backed HMAC state machine.

9 years agoresolved conflicts for merge of e7e705d4 to master
Alex Klyubin [Thu, 2 Apr 2015 21:58:27 +0000 (14:58 -0700)]
resolved conflicts for merge of e7e705d4 to master

Change-Id: If3e8c985f4f122f9fb36aab206787aac1407a74e

9 years agoFix resource type annotations for obtainStyledAttributes
Tor Norbye [Thu, 2 Apr 2015 00:41:55 +0000 (17:41 -0700)]
Fix resource type annotations for obtainStyledAttributes

Change-Id: I7681249ff46d687675d0dcd7d4f077646efba687

9 years agoMark all test keys as no auth required
Chad Brubaker [Thu, 2 Apr 2015 21:41:37 +0000 (14:41 -0700)]
Mark all test keys as no auth required

Now that auth token checks are in keystore keys without any auth tags
are invalid.

Also adds a test to check that a key with auth required fails when none
is present.

Change-Id: I0d5d44d70a849978e9b2e809675b8343c6650ff2

9 years agoam 378df98e: am 3cc9e5d6: Merge "Improve the AndroidKeyStore-backed HMAC state machine."
Alex Klyubin [Thu, 2 Apr 2015 21:34:52 +0000 (21:34 +0000)]
am 378df98e: am 3cc9e5d6: Merge "Improve the AndroidKeyStore-backed HMAC state machine."

* commit '378df98eab65547f62cb900e9dca0b7419095755':
  Improve the AndroidKeyStore-backed HMAC state machine.

9 years agoam acee5b2b: am 9635a56a: Merge "Expose new key use constraints in KeyPairGeneratorSpec."
Alex Klyubin [Thu, 2 Apr 2015 21:34:48 +0000 (21:34 +0000)]
am acee5b2b: am 9635a56a: Merge "Expose new key use constraints in KeyPairGeneratorSpec."

* commit 'acee5b2b4902479fabfb557aba745d352d49ce1a':
  Expose new key use constraints in KeyPairGeneratorSpec.

9 years agoam 3cc9e5d6: Merge "Improve the AndroidKeyStore-backed HMAC state machine."
Alex Klyubin [Thu, 2 Apr 2015 21:25:56 +0000 (21:25 +0000)]
am 3cc9e5d6: Merge "Improve the AndroidKeyStore-backed HMAC state machine."

* commit '3cc9e5d68d89ea1ffa79ad6981585bc46362c4a7':
  Improve the AndroidKeyStore-backed HMAC state machine.

9 years agoam 9635a56a: Merge "Expose new key use constraints in KeyPairGeneratorSpec."
Alex Klyubin [Thu, 2 Apr 2015 21:25:50 +0000 (21:25 +0000)]
am 9635a56a: Merge "Expose new key use constraints in KeyPairGeneratorSpec."

* commit '9635a56acfe3318d9ae5020727090a2dc8c118d0':
  Expose new key use constraints in KeyPairGeneratorSpec.

9 years agoMerge "Improve the AndroidKeyStore-backed HMAC state machine."
Alex Klyubin [Thu, 2 Apr 2015 21:06:27 +0000 (21:06 +0000)]
Merge "Improve the AndroidKeyStore-backed HMAC state machine."