188193 Commits

Author SHA1 Message Date
Alex Klyubin
ba2836e6cf Merge "Track recent keymaster_defs.h changes." 2015-04-10 00:01:19 +00:00
Alex Klyubin
862e6c7814 Track recent keymaster_defs.h changes.
Bug: 18088752
Change-Id: If47bb7cc7a385941db9f12d478676594e9bc9d86
2015-04-09 16:58:58 -07:00
Alex Klyubin
82cba6aa37 am c6eb6288: Merge "Split key origin into TEE/not and generated/imported."
* commit 'c6eb62882b09cf06e1e70c14e7878593d1a76477':
  Split key origin into TEE/not and generated/imported.
2015-04-09 23:55:47 +00:00
Alan Viverette
0680bcd1f9 Merge "Avoid double-apply of dialog theme" 2015-04-09 23:52:41 +00:00
Mathieu Chartier
6951d555c2 am 56a6d371: am da164973: Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category""
* commit '56a6d371bd4978bb7dfa7cce8bfbcc0bb13abd93':
  Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"
2015-04-09 23:47:20 +00:00
Mathieu Chartier
56a6d371bd am da164973: Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category""
* commit 'da164973f35aa32e44d0b9336deef28df5b13544':
  Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"
2015-04-09 23:36:06 +00:00
Alex Klyubin
c6eb62882b Merge "Split key origin into TEE/not and generated/imported." 2015-04-09 23:34:45 +00:00
Fabrice Di Meglio
5f76360ff9 Merge "Add IntentFilter auto verification - part 5" 2015-04-09 23:23:38 +00:00
Fabrice Di Meglio
e48c137acd Add IntentFilter auto verification - part 5
- optimize IntentFilter verification: dont do stuff we dont want
if we dont need to do them.

- improve IntentFilter candidates filtering and also improve
at the same time fix for bug #20128771: we can return the candidates
list rigth the way if the Intent is not related to a Web data URI and
include the "undefined verification state" ones if the first filtering
pass does not leave any.

Change-Id: I19f5c060f58b93530e37b4425d19ed23d2a0f4c0
2015-04-09 16:19:44 -07:00
Mathieu Chartier
da164973f3 Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"" 2015-04-09 23:14:28 +00:00
Mathieu Chartier
537691fc2d Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"
Example output of "adb shell dumpsys meminfo -d":

Total PSS by category:
   193605 kB: Dalvik
               87561 kB: .Heap
               77863 kB: .LOS
               15333 kB: .Zygote
               12848 kB: .NonMoving
                6770 kB: .GC
                2597 kB: .LinearAlloc
                1180 kB: .JITCache
                1180 kB: .IndirectRef
   103936 kB: EGL mtrack
   101827 kB: Native

Bug: 17643507

(cherry picked from commit 546edc5a31bb5a843048e11d8afb0b1f6441ddb4)

Change-Id: If34627cf93ba5305b428d2278f350a2649d63d5e
2015-04-09 15:53:17 -07:00
Alex Klyubin
b503c52f07 Split key origin into TEE/not and generated/imported.
This is to match the upcoming changes in Keymaster HAL API.

Bug: 18088752
Change-Id: I602d56d1c29a839583be1d9efa681a6fab6642db
2015-04-09 15:50:17 -07:00
Mathieu Chartier
b47ba1e7d5 Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"" 2015-04-09 22:48:53 +00:00
Jeff Tinker
74797f843c Add expiration update and keys change events
In support of unprefixed EME

bug: 19771612
bug: 19771431
Change-Id: Iddef695cfa1a56363a4c173249597e415cb93f50
2015-04-09 22:44:36 +00:00
Dianne Hackborn
24f683523e Merge "More work on device idle mode and other power stuff." 2015-04-09 22:35:36 +00:00
George Mount
4dc668cd36 Revert "Revert "Allow delay of showing/hiding shared element when transferring.""
This reverts commit 44d15f1c2e8f07ae9a88d79721547cf8e5935b6c.

Fix doc comment errors.

Change-Id: Ieeb07b907f0c66a133ef57136c45c504bcc04694
2015-04-09 15:31:38 -07:00
Ronghua Wu
564eb45b00 Merge "media: add new MediaCodec Callback onCodecReleased." 2015-04-09 22:29:14 +00:00
Jeff Sharkey
95f534143d am 84debe27: am e0001185: am 1d3c77a2: Merge "Start passing volume UUID to installd."
* commit '84debe2761433cfaa8203d5a2defa4ba2ed64b61':
  Start passing volume UUID to installd.
2015-04-09 22:21:50 +00:00
Alex Klyubin
43de2a9b52 am 4acc3392: am 8676a88e: am 97d2d7c4: Merge "Fix minor issues in new Javadocs of AndroidKeyStore."
* commit '4acc3392c35e5ad98c8e7b650b1368a2956746b7':
  Fix minor issues in new Javadocs of AndroidKeyStore.
2015-04-09 22:21:41 +00:00
Yohei Yukaw
fba00864f8 Merge "Verify that EditorInfo.packageName and uid are consistent" 2015-04-09 22:10:48 +00:00
Jeff Sharkey
84debe2761 am e0001185: am 1d3c77a2: Merge "Start passing volume UUID to installd."
* commit 'e000118549c10deaf17c27a14efa866184127b6d':
  Start passing volume UUID to installd.
2015-04-09 22:07:29 +00:00
Alex Klyubin
4acc3392c3 am 8676a88e: am 97d2d7c4: Merge "Fix minor issues in new Javadocs of AndroidKeyStore."
* commit '8676a88e60ed342cfb5c576aef80960976e3c396':
  Fix minor issues in new Javadocs of AndroidKeyStore.
2015-04-09 22:07:18 +00:00
Jeff Sharkey
e000118549 am 1d3c77a2: Merge "Start passing volume UUID to installd."
* commit '1d3c77a21e9c8fc59200b42503d9f0effd3f1551':
  Start passing volume UUID to installd.
2015-04-09 21:57:41 +00:00
Alex Klyubin
8676a88e60 am 97d2d7c4: Merge "Fix minor issues in new Javadocs of AndroidKeyStore."
* commit '97d2d7c42752a52b5fe890cdb9a5dcbbf53837cc':
  Fix minor issues in new Javadocs of AndroidKeyStore.
2015-04-09 21:57:35 +00:00
Ronghua Wu
4c302e8b14 media: add new MediaCodec Callback onCodecReleased.
Bug: 19620911
Change-Id: I2912c570678861daf1516757dda2160ffddcfa8d
2015-04-09 14:47:58 -07:00
Jeff Sharkey
1d3c77a21e Merge "Start passing volume UUID to installd." 2015-04-09 21:41:12 +00:00
Alex Klyubin
97d2d7c427 Merge "Fix minor issues in new Javadocs of AndroidKeyStore." 2015-04-09 21:41:00 +00:00
Mathieu Chartier
546edc5a31 Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"
Example output of "adb shell dumpsys meminfo -d":

Total PSS by category:
   193605 kB: Dalvik
               87561 kB: .Heap
               77863 kB: .LOS
               15333 kB: .Zygote
               12848 kB: .NonMoving
                6770 kB: .GC
                2597 kB: .LinearAlloc
                1180 kB: .JITCache
                1180 kB: .IndirectRef
   103936 kB: EGL mtrack
   101827 kB: Native

Bug: 17643507
Change-Id: Idd3e5560f376157c32094a5fbb84e8b6be4b2843
2015-04-09 14:39:00 -07:00
Alex Klyubin
7882a7fcd4 Fix minor issues in new Javadocs of AndroidKeyStore.
Bug: 18088752
Change-Id: Ie84cc6066c82f2659da17a1eb158c2e3acf5094d
2015-04-09 14:33:11 -07:00
Clara Bayarri
32b7f9fbcc Merge "Editor: Turn on Floating Toolbar Action Mode for Text Selection" 2015-04-09 21:31:51 +00:00
Jeff Sharkey
790a4ecac7 Start passing volume UUID to installd.
This change adds new method overloads to provide volume UUID.  The
older methods remain for now, and pass through the "null" UUID to
reference internal storage.

Follows the existing pattern where null arguments are passed as "!".

Bug: 19993667
Change-Id: Ia1b7c8550cabc13e4f6e1182eabb650f2c33e44f
2015-04-09 14:19:07 -07:00
Dianne Hackborn
4870e9d5eb More work on device idle mode and other power stuff.
Add idle mode support to the alarm manager.  Introduce
a new concept of flags associated with alarms to tell
the alarm manager how to treat the alarm -- they allow
everything from the alarm that will bring us out of idle
mode, to alarms that are allowed when idle or should
also bring us out of idle.  The standalone boolean is
now also a flag.

(Note there is currently no protection from user space
setting the flags however it wants; I will be working
on that in a follow-up change.)

When in idle mode, the alarm manager pushes all alarms
that shouldn't execute during that time over to a
separate list that is not executed until out of idle.
To help with this, I reworked a bit how Alarm objects
are managed, so that when rebatching or moving between
lists we don't have to allocated new objects but can
just use the same existing instance.

Also tweaked the sync manager to deal with idle mode,
which currently just means doing the same thing as when
low on storage -- turning off sync.

Add new ACTION_CHARGING and ACTION_DISCHARGING broadcasts
that apps can listen for to know when the device is actively
charging and discharging.  These are better than the old
POWER_CONNECTED and POWER_DISCONNECTED ones because we only
report charging when we actually see that there is enough
power being provided to charge the battery (and will report
discharging if there is not enough power).

The job controller uses these new actions for scheduling
jobs that want to run while plugged in.  Removed the
"stable charging" stuff while doing so, since the new
charging state serves as an even better signal for that.

Introduced two new process states: FOREGROUND_SERVICE and
TOP_SLEEPING.  This will allow us to treat foreground services
specially (such as still allowing network access to them for
background music playback) while not mixing them together with
whatever happens to be the top activity while the device is
asleep.

Also some other small cleanup here and there.

Change-Id: I7a9808b578bad6f50deb8e1baf919298512a0d3a
2015-04-09 14:05:17 -07:00
Mike Lockwood
d954fbb967 Merge "Add support for Bluetooth MIDI devices" 2015-04-09 21:02:09 +00:00
Mike Lockwood
427a90c57a Merge "Add support for flushing MIDI all scheduled MIDI events on a port" 2015-04-09 21:01:44 +00:00
Chet Haase
6498506330 Merge "Fix breakage from ActionBar animations" 2015-04-09 20:38:07 +00:00
Alex Klyubin
981913babf am 098833c5: am ec01623b: am aeae0f38: Merge "Add asymmetric crypto constants for AndroidKeyStore API."
* commit '098833c59d8b3984e3983169b460198c2d5e2670':
  Add asymmetric crypto constants for AndroidKeyStore API.
2015-04-09 20:34:56 +00:00
Alex Klyubin
27077471a3 am c6112eb7: am 21c4e465: am 8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC names."
* commit 'c6112eb7057f91df1f885da37564f89a423f64e4':
  Add missing mapping between JCA and keystore HMAC names.
2015-04-09 20:34:46 +00:00
Chris Wren
723aa768f6 Support ad hoc counters in the framework
with some examples in NotificationManagerService.

New counters in this CL:
  note_with_people
  note_dismiss_longevity
  note_click_longevity

Bug: 20137009
Change-Id: I10b769ff4872d50f4c1c3828ea519f9712be7bc2
2015-04-09 16:33:06 -04:00
Alex Klyubin
098833c59d am ec01623b: am aeae0f38: Merge "Add asymmetric crypto constants for AndroidKeyStore API."
* commit 'ec01623b0b456c9e8f43123f1f96fb2330a6615f':
  Add asymmetric crypto constants for AndroidKeyStore API.
2015-04-09 20:24:28 +00:00
Alex Klyubin
c6112eb705 am 21c4e465: am 8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC names."
* commit '21c4e465f6a4783a9356bf1d88bda42192af022f':
  Add missing mapping between JCA and keystore HMAC names.
2015-04-09 20:24:22 +00:00
Christopher Tate
f4ab2b1074 Merge "Add system API for querying the available restore dataset for a package" 2015-04-09 20:20:31 +00:00
Alan Viverette
b88e1227d5 Merge "Only parse LayerDrawable child items when necessary" 2015-04-09 20:16:33 +00:00
Alex Klyubin
ec01623b0b am aeae0f38: Merge "Add asymmetric crypto constants for AndroidKeyStore API."
* commit 'aeae0f384f72d4deca698697b125b82b322f7f90':
  Add asymmetric crypto constants for AndroidKeyStore API.
2015-04-09 20:15:02 +00:00
Alex Klyubin
21c4e465f6 am 8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC names."
* commit '8c58ba87bb82993b2bd5dbdd948d15fe3297d08e':
  Add missing mapping between JCA and keystore HMAC names.
2015-04-09 20:14:56 +00:00
Alan Viverette
45f207d6d9 Only parse LayerDrawable child items when necessary
Bug: 20098214
Change-Id: Ie9da5f6e494ede47f9fdc94481a3f8ca41d3ef00
2015-04-09 13:14:32 -07:00
Fabrice Di Meglio
7c6a34e64a Merge "Fix bug #20128771 All apps disappeared from app drawer after AAZ08 OTA" 2015-04-09 20:13:57 +00:00
Christopher Tate
511d02fcc3 Add system API for querying the available restore dataset for a package
Bug 20123585

Change-Id: Ife6e77a224b5d4175178aacdb7c285e9944b9eab
2015-04-09 13:13:42 -07:00
Chris Wren
531d5ab59d Merge "update metrics constants" 2015-04-09 20:13:27 +00:00
Fabrice Di Meglio
53f35f4a20 Fix bug #20128771 All apps disappeared from app drawer after AAZ08 OTA
- relax a bit Intent resolution. We should still include Apps that
do not support Web domains :-) so in that context add in the result
list the Apps that are with a status INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED

Change-Id: Ibad7b7f577552ac75bba256bb387a75b83524958
2015-04-09 13:10:35 -07:00
Bryce Lee
eccaf7290a Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with
keyguard enabled.

Bug: 20037090
Change-Id: I613f3278a234e3961cb4be1976da0f821aebfc1f
2015-04-09 13:10:33 -07:00