OSDN Git Service
Doris Liu [Fri, 10 Apr 2015 17:19:41 +0000 (17:19 +0000)]
Merge "Add a check for color type in property values holder"
Craig Lafayette [Fri, 10 Apr 2015 17:15:47 +0000 (17:15 +0000)]
Merge "Reset protection in PersistentDataBlockManager"
Craig Lafayette [Fri, 27 Mar 2015 13:01:43 +0000 (09:01 -0400)]
Reset protection in PersistentDataBlockManager
Add method to allow authorized data block wipe in support of factory
reset protection. This will allow ManagedProvisioning to respond to
and pass factory reset protection challenges during automated device
setup.
- Adds the wipeIfAllowed method to clear the data block
- Creates a protected-broadcast to send to allowed package
Bug:
19792435
Change-Id: I897f2ea2afb1222a1fc8ac49290ee45ea4d3f2d7
Nick Kralevich [Fri, 10 Apr 2015 16:58:17 +0000 (16:58 +0000)]
am
12a597a2: am
a55ec9c2: am
08d76a94: Merge "Impose an ordering on created SELinuxMMAC Policy objects."
* commit '
12a597a2bc92eda2f33bc85bb1c525989c261abf':
Impose an ordering on created SELinuxMMAC Policy objects.
Mike Lockwood [Fri, 10 Apr 2015 16:54:00 +0000 (16:54 +0000)]
Merge changes I075a54dc,I0a9bc7c3
* changes:
Add user visible name for USB peripheral MIDI device
Add MidiDeviceInfo.getPortList()
Nick Kralevich [Fri, 10 Apr 2015 16:42:25 +0000 (16:42 +0000)]
am
a55ec9c2: am
08d76a94: Merge "Impose an ordering on created SELinuxMMAC Policy objects."
* commit '
a55ec9c2abfd8a8bd216f133ec925e9db1d69ae7':
Impose an ordering on created SELinuxMMAC Policy objects.
Nick Kralevich [Fri, 10 Apr 2015 16:31:23 +0000 (16:31 +0000)]
am
08d76a94: Merge "Impose an ordering on created SELinuxMMAC Policy objects."
* commit '
08d76a946b898af28f3c8125cdf4966195b718fb':
Impose an ordering on created SELinuxMMAC Policy objects.
Nick Kralevich [Fri, 10 Apr 2015 16:10:26 +0000 (16:10 +0000)]
Merge "Impose an ordering on created SELinuxMMAC Policy objects."
John Reck [Fri, 10 Apr 2015 16:06:04 +0000 (16:06 +0000)]
am
18ae2a02: am
32eafe9b: am
a08f6a66: Merge "Fix GL_INVALID_OPERATION in font renderer when font cache is limited."
* commit '
18ae2a020d3c720f8b6125b9f4567e953f04c7b0':
Fix GL_INVALID_OPERATION in font renderer when font cache is limited.
John Reck [Fri, 10 Apr 2015 16:05:50 +0000 (16:05 +0000)]
am
6b6645c8: am
1a595833: am
d56e087b: Merge "Fixing memory leak in RenderBufferCache"
* commit '
6b6645c8951e95b2802c489ab2d87f004c610ffc':
Fixing memory leak in RenderBufferCache
John Reck [Fri, 10 Apr 2015 15:55:33 +0000 (15:55 +0000)]
am
32eafe9b: am
a08f6a66: Merge "Fix GL_INVALID_OPERATION in font renderer when font cache is limited."
* commit '
32eafe9b715b08453eea213d7dcad174ac5e80d2':
Fix GL_INVALID_OPERATION in font renderer when font cache is limited.
John Reck [Fri, 10 Apr 2015 15:55:27 +0000 (15:55 +0000)]
am
1a595833: am
d56e087b: Merge "Fixing memory leak in RenderBufferCache"
* commit '
1a5958331ef5f51d7722682d7e980204a1c50a04':
Fixing memory leak in RenderBufferCache
Mike Lockwood [Fri, 10 Apr 2015 15:25:55 +0000 (08:25 -0700)]
Add user visible name for USB peripheral MIDI device
Change-Id: I075a54dc3890bc5cf3927cecba3750e1d342d290
Mike Lockwood [Fri, 10 Apr 2015 00:51:32 +0000 (17:51 -0700)]
Add MidiDeviceInfo.getPortList()
This replaces MidiDeviceInfo.getInputPortInfo() and getOutputPortInfo()
Change-Id: I0a9bc7c34a172a072e86718d465967c6c618fb3b
John Reck [Fri, 10 Apr 2015 15:44:34 +0000 (15:44 +0000)]
am
a08f6a66: Merge "Fix GL_INVALID_OPERATION in font renderer when font cache is limited."
* commit '
a08f6a66e91c7bacd50e64c039aaaa6b9fe2625c':
Fix GL_INVALID_OPERATION in font renderer when font cache is limited.
John Reck [Fri, 10 Apr 2015 15:44:26 +0000 (15:44 +0000)]
am
d56e087b: Merge "Fixing memory leak in RenderBufferCache"
* commit '
d56e087b550f7ee351f15ac6c5ff9d57a08387fc':
Fixing memory leak in RenderBufferCache
John Reck [Fri, 10 Apr 2015 15:32:00 +0000 (15:32 +0000)]
Merge "Fix GL_INVALID_OPERATION in font renderer when font cache is limited."
John Reck [Fri, 10 Apr 2015 15:27:01 +0000 (15:27 +0000)]
Merge "Fixing memory leak in RenderBufferCache"
Robert Craig [Fri, 10 Apr 2015 15:02:33 +0000 (11:02 -0400)]
Impose an ordering on created SELinuxMMAC Policy objects.
Imposing an order on Policy objects allows us to extend the
policy writers ability to union mac_permissions.xml files.
Policy developers can now create new mac_permissions.xml
entries under their device specific directories. This is
in contrast to current methods which only allow differing
stanzas to appear outside the base mac_permissions.xml.
Also, report on stanzas with duplicate input selectors and
treat these as errors. There are some ambiguities that can
arise otherwise.
Lastly, impose an XOR condition on signer stanzas w.r.t seinfo
and package tags. This finer distinction helps the union feature
of policy to become clearer and simpler to code.
Change-Id: Idd86df8ad9a63d1b8ba6e8270670814ca6cee8d2
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
George Mount [Fri, 10 Apr 2015 14:25:37 +0000 (14:25 +0000)]
Merge "Revert "Revert "Allow delay of showing/hiding shared element when transferring."""
Chris Wren [Fri, 10 Apr 2015 14:12:23 +0000 (14:12 +0000)]
Merge "Support ad hoc counters in the framework"
Andrew Flynn [Fri, 10 Apr 2015 14:04:56 +0000 (14:04 +0000)]
Merge "Consolidate SystemUI SharedPreferences."
Andrew Flynn [Wed, 1 Apr 2015 18:22:37 +0000 (14:22 -0400)]
Consolidate SystemUI SharedPreferences.
Makes it easier to use from any place and gets us type-safety.
Change-Id: I472e340e8332d9a173335b6f337525d58d801881
John Spurlock [Fri, 10 Apr 2015 12:10:22 +0000 (08:10 -0400)]
Zen: New option to allow repeat callers.
Bug:
20064962
Change-Id: I11a5519c02bf8fa8e332559092c865c5e612fbd2
Clara Bayarri [Fri, 10 Apr 2015 10:02:19 +0000 (10:02 +0000)]
Merge "Editor: Allow invalidation of the Text Selection Action Mode"
Narayan Kamath [Wed, 8 Apr 2015 12:24:13 +0000 (13:24 +0100)]
Create DropboxService lazily.
We seldom use it from libcore.io.DropBox so there's not much point
(there's only one usage, from a conscrypt SSL error). This saves > 10ms
from ActivityThread.attach.
Change-Id: I360158ef9a36a9ababd700e4f3243c92b74047eb
Seigo Nonaka [Tue, 7 Apr 2015 12:02:13 +0000 (21:02 +0900)]
Introduce Ctrl+Backspace/Ctrl+ForwardDelete shortcut.
Ctrl+Backspace deletes preceding one word and Ctrl+ForwardDelete delets
following one word.
Used Chrome's implementation/behvior as a reference.
Bug:
17810742
Change-Id: I7b2ca515b2f017e457f7104ec7b8e7473ca4e081
Pirama Arumuga Nainar [Fri, 10 Apr 2015 04:37:01 +0000 (04:37 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
Seigo Nonaka [Fri, 10 Apr 2015 04:35:36 +0000 (04:35 +0000)]
Merge "Fix unexpected selection cancellation"
Tim Murray [Fri, 10 Apr 2015 04:35:04 +0000 (04:35 +0000)]
am
72fcf9eb: am
af61d43d: am
6d718c2f: Merge "Add support for setting the cache directory."
* commit '
72fcf9eb1079312afd7bdbee167c759109af4244':
Add support for setting the cache directory.
Alex Klyubin [Fri, 10 Apr 2015 04:34:13 +0000 (04:34 +0000)]
am
037dfb94: am
5f8c17b9: am
ba2836e6: Merge "Track recent keymaster_defs.h changes."
* commit '
037dfb9423a0988398b67520546dae5673aa54bb':
Track recent keymaster_defs.h changes.
Alex Klyubin [Fri, 10 Apr 2015 04:33:48 +0000 (04:33 +0000)]
am
04a99c7b: am
82cba6aa: am
c6eb6288: Merge "Split key origin into TEE/not and generated/imported."
* commit '
04a99c7b4435598e4f9d53fadbe5faca4ad7ebdc':
Split key origin into TEE/not and generated/imported.
Mathieu Chartier [Fri, 10 Apr 2015 04:33:25 +0000 (04:33 +0000)]
am
6951d555: am
56a6d371: am
da164973: Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category""
* commit '
6951d555c2060e19bd9db46a772852db8aa24dfe':
Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"
Seigo Nonaka [Fri, 10 Apr 2015 03:35:29 +0000 (03:35 +0000)]
Merge "Use TextView's text locale for capitalization."
Jeff Brown [Fri, 10 Apr 2015 03:11:41 +0000 (03:11 +0000)]
Merge "Expose Cursor.setExtras()."
Doris Liu [Fri, 10 Apr 2015 03:11:22 +0000 (20:11 -0700)]
Add a check for color type in property values holder
Bug:
20140483
Change-Id: Ic6cc72388811a450e29a346625c785456834452b
Jeff Brown [Fri, 10 Apr 2015 02:50:05 +0000 (02:50 +0000)]
Merge "Clean up AbstractCursor API."
Jeff Brown [Fri, 10 Apr 2015 02:49:34 +0000 (02:49 +0000)]
Merge "Remove deprecated fields in AbstractCursor."
Jeff Brown [Fri, 10 Apr 2015 01:28:24 +0000 (18:28 -0700)]
Expose Cursor.setExtras().
Bug:
19369537
Change-Id: I78e319667cbfaeb51f471d18c4fefeac01d49d80
Jeff Brown [Fri, 10 Apr 2015 01:52:52 +0000 (18:52 -0700)]
Clean up AbstractCursor API.
Deprecated three protected fields that should not have been
exposed in the API.
Bug:
6353797
Change-Id: Ic6710f880a452dd1508abf0613907a1d2b1fb557
Jeff Brown [Fri, 10 Apr 2015 01:32:35 +0000 (18:32 -0700)]
Remove deprecated fields in AbstractCursor.
Bug:
6353797
Change-Id: Ibf760f0aeef82c176e3c659a2ced3de07f8e8abe
Chong Zhang [Fri, 10 Apr 2015 02:29:36 +0000 (02:29 +0000)]
Merge "MediaMetadataRetriever: add key for capture fps"
John Spurlock [Fri, 10 Apr 2015 02:07:51 +0000 (02:07 +0000)]
Merge "Volume: Update media bluetooth icons."
John Spurlock [Fri, 10 Apr 2015 02:04:14 +0000 (22:04 -0400)]
Volume: Update media bluetooth icons.
Note + bt logo.
Bug:
19260237
Change-Id: I32cb497505f7dea94d761637064f8f8e585ffa94
John Spurlock [Fri, 10 Apr 2015 01:48:02 +0000 (01:48 +0000)]
Merge "An update on Downtime."
John Spurlock [Tue, 7 Apr 2015 16:47:12 +0000 (12:47 -0400)]
An update on Downtime.
The update is that Downtime is obsolete. Replaced by the
ability to define multiple named schedule calendars.
- Make changes to ZenModeConfig to properly model manual
and automatic rules.
- Refactor the zen mode helper (and supporting classes) to
properly handle / report multiple claims on zen mode.
The "manual" rule (specified by the user in the UI) vs
one or more automatic rules.
- Automatic rules are still backed by condition providers,
but the layering is now cleaner. ConditionProviders is now
completely generic, has no ties to zen mode.
- Specifically, the new layering for zen mode (below noman) is:
ZenModeHelper: Source of truth for zen state
ZenModeFiltering: Subhelper dedicated to filtering rules.
ZenModeConditions: Subhelper dedicated to managing automatic rules.
ConditionProviders: Underlying engine for reporting named boolean state.
- Migration story for users with existing downtime config, migrated
to a single new calendar named downtime.
- For users with no existing downtime, two default calendars are created
for weeknights + weekends (icu4j for all locales will be done in a followup).
- Remove obsolete DowntimeConditionProvider/NextAlarmConditionProvider and tracking.
- Clean up obsolete resources.
- Add common zen summary description string computation.
- Add proper noman wrappers for the new model.
- Change the semantics of the global zen setting. It is now read-only. Setters
must call noman, added a "reason" to all calls for better attribution.
- Update zenmodepanel + volumedialog to the new model.
- Display the one or more automatic rules in the new zen footer summary.
- "Snooze" the automatic rules when the user explicitly turns zen off.
Bug:
20064962
Change-Id: Idd9deb865a6035ad0cfae660198dccb517e6d7cc
Tim Murray [Fri, 10 Apr 2015 01:30:14 +0000 (01:30 +0000)]
am
af61d43d: am
6d718c2f: Merge "Add support for setting the cache directory."
* commit '
af61d43d6ce065832f906757c2185c3dad74d489':
Add support for setting the cache directory.
Tim Murray [Fri, 10 Apr 2015 01:07:26 +0000 (01:07 +0000)]
am
6d718c2f: Merge "Add support for setting the cache directory."
* commit '
6d718c2f43f6be057f9a519bc02f6b123405b79d':
Add support for setting the cache directory.
Tim Murray [Fri, 10 Apr 2015 00:51:14 +0000 (00:51 +0000)]
Merge "Add support for setting the cache directory."
Tim Murray [Tue, 7 Apr 2015 22:43:24 +0000 (15:43 -0700)]
Add support for setting the cache directory.
Change-Id: I2bf1874705b877a8a8262ab49b47fe8241e603d5
Alex Klyubin [Fri, 10 Apr 2015 00:35:55 +0000 (00:35 +0000)]
am
5f8c17b9: am
ba2836e6: Merge "Track recent keymaster_defs.h changes."
* commit '
5f8c17b9f6d574eca6a24ddb2f7cc98a37f5aaea':
Track recent keymaster_defs.h changes.
Adam Lesinski [Fri, 10 Apr 2015 00:32:27 +0000 (00:32 +0000)]
Merge "Add PNG and 9-patch support"
Alex Klyubin [Fri, 10 Apr 2015 00:22:45 +0000 (00:22 +0000)]
am
ba2836e6: Merge "Track recent keymaster_defs.h changes."
* commit '
ba2836e6cf5a00855e470705741d9e4b9b1a9df9':
Track recent keymaster_defs.h changes.
Adam Lesinski [Mon, 6 Apr 2015 18:46:52 +0000 (11:46 -0700)]
Add PNG and 9-patch support
Change-Id: I9ecdfdf82b82d59084490da518e167e256afd5f2
Alex Klyubin [Fri, 10 Apr 2015 00:06:25 +0000 (00:06 +0000)]
am
82cba6aa: am
c6eb6288: Merge "Split key origin into TEE/not and generated/imported."
* commit '
82cba6aa3792b7d3b7eddf32c64cbf4a7a47e5a5':
Split key origin into TEE/not and generated/imported.
Alex Klyubin [Fri, 10 Apr 2015 00:01:18 +0000 (00:01 +0000)]
Merge "Track recent keymaster_defs.h changes."
Alex Klyubin [Thu, 9 Apr 2015 23:58:58 +0000 (16:58 -0700)]
Track recent keymaster_defs.h changes.
Bug:
18088752
Change-Id: If47bb7cc7a385941db9f12d478676594e9bc9d86
Alex Klyubin [Thu, 9 Apr 2015 23:55:47 +0000 (23:55 +0000)]
am
c6eb6288: Merge "Split key origin into TEE/not and generated/imported."
* commit '
c6eb62882b09cf06e1e70c14e7878593d1a76477':
Split key origin into TEE/not and generated/imported.
Alan Viverette [Thu, 9 Apr 2015 23:52:38 +0000 (23:52 +0000)]
Merge "Avoid double-apply of dialog theme"
Mathieu Chartier [Thu, 9 Apr 2015 23:47:20 +0000 (23:47 +0000)]
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"
Mathieu Chartier [Thu, 9 Apr 2015 23:36:06 +0000 (23:36 +0000)]
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"
Alex Klyubin [Thu, 9 Apr 2015 23:34:44 +0000 (23:34 +0000)]
Merge "Split key origin into TEE/not and generated/imported."
Fabrice Di Meglio [Thu, 9 Apr 2015 23:23:37 +0000 (23:23 +0000)]
Merge "Add IntentFilter auto verification - part 5"
Fabrice Di Meglio [Thu, 9 Apr 2015 22:55:42 +0000 (15:55 -0700)]
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
Mathieu Chartier [Thu, 9 Apr 2015 23:14:27 +0000 (23:14 +0000)]
Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category""
Mathieu Chartier [Thu, 9 Apr 2015 21:32:31 +0000 (14:32 -0700)]
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
Alex Klyubin [Thu, 9 Apr 2015 22:50:17 +0000 (15:50 -0700)]
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
Mathieu Chartier [Thu, 9 Apr 2015 22:48:47 +0000 (22:48 +0000)]
Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category""
Jeff Tinker [Tue, 31 Mar 2015 22:44:34 +0000 (15:44 -0700)]
Add expiration update and keys change events
In support of unprefixed EME
bug:
19771612
bug:
19771431
Change-Id: Iddef695cfa1a56363a4c173249597e415cb93f50
Dianne Hackborn [Thu, 9 Apr 2015 22:35:32 +0000 (22:35 +0000)]
Merge "More work on device idle mode and other power stuff."
George Mount [Thu, 9 Apr 2015 20:55:59 +0000 (20:55 +0000)]
Revert "Revert "Allow delay of showing/hiding shared element when transferring.""
This reverts commit
44d15f1c2e8f07ae9a88d79721547cf8e5935b6c.
Fix doc comment errors.
Change-Id: Ieeb07b907f0c66a133ef57136c45c504bcc04694
Ronghua Wu [Thu, 9 Apr 2015 22:29:13 +0000 (22:29 +0000)]
Merge "media: add new MediaCodec Callback onCodecReleased."
Jeff Sharkey [Thu, 9 Apr 2015 22:21:50 +0000 (22:21 +0000)]
am
84debe27: am
e0001185: am
1d3c77a2: Merge "Start passing volume UUID to installd."
* commit '
84debe2761433cfaa8203d5a2defa4ba2ed64b61':
Start passing volume UUID to installd.
Alex Klyubin [Thu, 9 Apr 2015 22:21:41 +0000 (22:21 +0000)]
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.
Yohei Yukaw [Thu, 9 Apr 2015 22:10:45 +0000 (22:10 +0000)]
Merge "Verify that EditorInfo.packageName and uid are consistent"
Jeff Sharkey [Thu, 9 Apr 2015 22:07:29 +0000 (22:07 +0000)]
am
e0001185: am
1d3c77a2: Merge "Start passing volume UUID to installd."
* commit '
e000118549c10deaf17c27a14efa866184127b6d':
Start passing volume UUID to installd.
Alex Klyubin [Thu, 9 Apr 2015 22:07:18 +0000 (22:07 +0000)]
am
8676a88e: am
97d2d7c4: Merge "Fix minor issues in new Javadocs of AndroidKeyStore."
* commit '
8676a88e60ed342cfb5c576aef80960976e3c396':
Fix minor issues in new Javadocs of AndroidKeyStore.
Jeff Sharkey [Thu, 9 Apr 2015 21:57:41 +0000 (21:57 +0000)]
am
1d3c77a2: Merge "Start passing volume UUID to installd."
* commit '
1d3c77a21e9c8fc59200b42503d9f0effd3f1551':
Start passing volume UUID to installd.
Alex Klyubin [Thu, 9 Apr 2015 21:57:35 +0000 (21:57 +0000)]
am
97d2d7c4: Merge "Fix minor issues in new Javadocs of AndroidKeyStore."
* commit '
97d2d7c42752a52b5fe890cdb9a5dcbbf53837cc':
Fix minor issues in new Javadocs of AndroidKeyStore.
Ronghua Wu [Thu, 19 Mar 2015 18:17:20 +0000 (11:17 -0700)]
media: add new MediaCodec Callback onCodecReleased.
Bug:
19620911
Change-Id: I2912c570678861daf1516757dda2160ffddcfa8d
Jeff Sharkey [Thu, 9 Apr 2015 21:41:11 +0000 (21:41 +0000)]
Merge "Start passing volume UUID to installd."
Alex Klyubin [Thu, 9 Apr 2015 21:40:58 +0000 (21:40 +0000)]
Merge "Fix minor issues in new Javadocs of AndroidKeyStore."
Mathieu Chartier [Thu, 9 Apr 2015 21:32:31 +0000 (14:32 -0700)]
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
Alex Klyubin [Thu, 9 Apr 2015 21:33:11 +0000 (14:33 -0700)]
Fix minor issues in new Javadocs of AndroidKeyStore.
Bug:
18088752
Change-Id: Ie84cc6066c82f2659da17a1eb158c2e3acf5094d
Clara Bayarri [Thu, 9 Apr 2015 21:31:49 +0000 (21:31 +0000)]
Merge "Editor: Turn on Floating Toolbar Action Mode for Text Selection"
Jeff Sharkey [Thu, 9 Apr 2015 20:18:44 +0000 (13:18 -0700)]
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
Dianne Hackborn [Wed, 8 Apr 2015 23:55:47 +0000 (16:55 -0700)]
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
Mike Lockwood [Thu, 9 Apr 2015 21:02:08 +0000 (21:02 +0000)]
Merge "Add support for Bluetooth MIDI devices"
Mike Lockwood [Thu, 9 Apr 2015 21:01:43 +0000 (21:01 +0000)]
Merge "Add support for flushing MIDI all scheduled MIDI events on a port"
Chet Haase [Thu, 9 Apr 2015 20:38:04 +0000 (20:38 +0000)]
Merge "Fix breakage from ActionBar animations"
Alex Klyubin [Thu, 9 Apr 2015 20:34:56 +0000 (20:34 +0000)]
am
098833c5: am
ec01623b: am
aeae0f38: Merge "Add asymmetric crypto constants for AndroidKeyStore API."
* commit '
098833c59d8b3984e3983169b460198c2d5e2670':
Add asymmetric crypto constants for AndroidKeyStore API.
Alex Klyubin [Thu, 9 Apr 2015 20:34:46 +0000 (20:34 +0000)]
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.
Chris Wren [Thu, 9 Apr 2015 19:35:23 +0000 (15:35 -0400)]
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
Alex Klyubin [Thu, 9 Apr 2015 20:24:28 +0000 (20:24 +0000)]
am
ec01623b: am
aeae0f38: Merge "Add asymmetric crypto constants for AndroidKeyStore API."
* commit '
ec01623b0b456c9e8f43123f1f96fb2330a6615f':
Add asymmetric crypto constants for AndroidKeyStore API.
Alex Klyubin [Thu, 9 Apr 2015 20:24:22 +0000 (20:24 +0000)]
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.
Christopher Tate [Thu, 9 Apr 2015 20:20:24 +0000 (20:20 +0000)]
Merge "Add system API for querying the available restore dataset for a package"
Alan Viverette [Thu, 9 Apr 2015 20:16:32 +0000 (20:16 +0000)]
Merge "Only parse LayerDrawable child items when necessary"
Alex Klyubin [Thu, 9 Apr 2015 20:15:02 +0000 (20:15 +0000)]
am
aeae0f38: Merge "Add asymmetric crypto constants for AndroidKeyStore API."
* commit '
aeae0f384f72d4deca698697b125b82b322f7f90':
Add asymmetric crypto constants for AndroidKeyStore API.
Alex Klyubin [Thu, 9 Apr 2015 20:14:56 +0000 (20:14 +0000)]
am
8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC names."
* commit '
8c58ba87bb82993b2bd5dbdd948d15fe3297d08e':
Add missing mapping between JCA and keystore HMAC names.
Alan Viverette [Thu, 9 Apr 2015 20:14:32 +0000 (13:14 -0700)]
Only parse LayerDrawable child items when necessary
Bug:
20098214
Change-Id: Ie9da5f6e494ede47f9fdc94481a3f8ca41d3ef00