188013 Commits

Author SHA1 Message Date
Craig Lafayette
2a91bbfb4d Merge "Reset protection in PersistentDataBlockManager" 2015-04-10 17:15:49 +00:00
Craig Lafayette
66445a639d 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
2015-04-10 13:14:24 -04:00
Nick Kralevich
a3e28e69e5 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.
2015-04-10 16:58:17 +00:00
Mike Lockwood
d4ca39e75c Merge changes I075a54dc,I0a9bc7c3
* changes:
  Add user visible name for USB peripheral MIDI device
  Add MidiDeviceInfo.getPortList()
2015-04-10 16:54:02 +00:00
Nick Kralevich
12a597a2bc am a55ec9c2: am 08d76a94: Merge "Impose an ordering on created SELinuxMMAC Policy objects."
* commit 'a55ec9c2abfd8a8bd216f133ec925e9db1d69ae7':
  Impose an ordering on created SELinuxMMAC Policy objects.
2015-04-10 16:42:25 +00:00
Nick Kralevich
a55ec9c2ab am 08d76a94: Merge "Impose an ordering on created SELinuxMMAC Policy objects."
* commit '08d76a946b898af28f3c8125cdf4966195b718fb':
  Impose an ordering on created SELinuxMMAC Policy objects.
2015-04-10 16:31:23 +00:00
Nick Kralevich
08d76a946b Merge "Impose an ordering on created SELinuxMMAC Policy objects." 2015-04-10 16:10:27 +00:00
John Reck
cdd3021936 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.
2015-04-10 16:06:04 +00:00
John Reck
72aaa88f2e am 6b6645c8: am 1a595833: am d56e087b: Merge "Fixing memory leak in RenderBufferCache"
* commit '6b6645c8951e95b2802c489ab2d87f004c610ffc':
  Fixing memory leak in RenderBufferCache
2015-04-10 16:05:50 +00:00
John Reck
18ae2a020d 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.
2015-04-10 15:55:33 +00:00
John Reck
6b6645c895 am 1a595833: am d56e087b: Merge "Fixing memory leak in RenderBufferCache"
* commit '1a5958331ef5f51d7722682d7e980204a1c50a04':
  Fixing memory leak in RenderBufferCache
2015-04-10 15:55:27 +00:00
Mike Lockwood
dee5f1bb6e Add user visible name for USB peripheral MIDI device
Change-Id: I075a54dc3890bc5cf3927cecba3750e1d342d290
2015-04-10 08:49:53 -07:00
Mike Lockwood
9189f5f025 Add MidiDeviceInfo.getPortList()
This replaces MidiDeviceInfo.getInputPortInfo() and getOutputPortInfo()

Change-Id: I0a9bc7c34a172a072e86718d465967c6c618fb3b
2015-04-10 08:49:47 -07:00
John Reck
32eafe9b71 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.
2015-04-10 15:44:34 +00:00
John Reck
1a5958331e am d56e087b: Merge "Fixing memory leak in RenderBufferCache"
* commit 'd56e087b550f7ee351f15ac6c5ff9d57a08387fc':
  Fixing memory leak in RenderBufferCache
2015-04-10 15:44:26 +00:00
John Reck
a08f6a66e9 Merge "Fix GL_INVALID_OPERATION in font renderer when font cache is limited." 2015-04-10 15:32:01 +00:00
John Reck
d56e087b55 Merge "Fixing memory leak in RenderBufferCache" 2015-04-10 15:27:02 +00:00
Robert Craig
4caa6b1efb 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>
2015-04-10 11:14:37 -04:00
George Mount
44220d7d9a Merge "Revert "Revert "Allow delay of showing/hiding shared element when transferring.""" 2015-04-10 14:25:37 +00:00
Chris Wren
250662a4ae Merge "Support ad hoc counters in the framework" 2015-04-10 14:12:25 +00:00
Andrew Flynn
23c5d1e196 Merge "Consolidate SystemUI SharedPreferences." 2015-04-10 14:04:57 +00:00
Andrew Flynn
82862573bc Consolidate SystemUI SharedPreferences.
Makes it easier to use from any place and gets us type-safety.

Change-Id: I472e340e8332d9a173335b6f337525d58d801881
2015-04-10 09:54:17 -04:00
John Spurlock
1d7d2248ec Zen: New option to allow repeat callers.
Bug: 20064962
Change-Id: I11a5519c02bf8fa8e332559092c865c5e612fbd2
2015-04-10 09:21:08 -04:00
Clara Bayarri
4c42bc045d Merge "Editor: Allow invalidation of the Text Selection Action Mode" 2015-04-10 10:02:21 +00:00
Narayan Kamath
7f062245f6 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
2015-04-10 08:20:45 +00:00
Seigo Nonaka
f2b233d44c 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
2015-04-10 15:18:10 +09:00
Pirama Arumuga Nainar
d119e52050 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-04-10 04:37:01 +00:00
Seigo Nonaka
7bfcad3427 Merge "Fix unexpected selection cancellation" 2015-04-10 04:35:38 +00:00
Tim Murray
9509bfe46a am 72fcf9eb: am af61d43d: am 6d718c2f: Merge "Add support for setting the cache directory."
* commit '72fcf9eb1079312afd7bdbee167c759109af4244':
  Add support for setting the cache directory.
2015-04-10 04:35:04 +00:00
Alex Klyubin
8d33804b01 am 037dfb94: am 5f8c17b9: am ba2836e6: Merge "Track recent keymaster_defs.h changes."
* commit '037dfb9423a0988398b67520546dae5673aa54bb':
  Track recent keymaster_defs.h changes.
2015-04-10 04:34:13 +00:00
Alex Klyubin
2c5eaa0157 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.
2015-04-10 04:33:48 +00:00
Mathieu Chartier
7819e443b0 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"
2015-04-10 04:33:25 +00:00
Seigo Nonaka
7f9be1cbfa Merge "Use TextView's text locale for capitalization." 2015-04-10 03:35:32 +00:00
Jeff Brown
cb0392fa1c Merge "Expose Cursor.setExtras()." 2015-04-10 03:11:44 +00:00
Jeff Brown
b77640533f Merge "Clean up AbstractCursor API." 2015-04-10 02:50:08 +00:00
Jeff Brown
004a170458 Merge "Remove deprecated fields in AbstractCursor." 2015-04-10 02:49:36 +00:00
Jeff Brown
4e0951ef7a Expose Cursor.setExtras().
Bug: 19369537
Change-Id: I78e319667cbfaeb51f471d18c4fefeac01d49d80
2015-04-09 19:48:11 -07:00
Jeff Brown
8faab36fdd Clean up AbstractCursor API.
Deprecated three protected fields that should not have been
exposed in the API.

Bug: 6353797
Change-Id: Ic6710f880a452dd1508abf0613907a1d2b1fb557
2015-04-09 19:48:10 -07:00
Jeff Brown
4670513e70 Remove deprecated fields in AbstractCursor.
Bug: 6353797
Change-Id: Ibf760f0aeef82c176e3c659a2ced3de07f8e8abe
2015-04-09 19:48:10 -07:00
Chong Zhang
0bb34ca325 Merge "MediaMetadataRetriever: add key for capture fps" 2015-04-10 02:29:38 +00:00
John Spurlock
11145938bb Merge "Volume: Update media bluetooth icons." 2015-04-10 02:07:52 +00:00
John Spurlock
f15ef112e7 Volume: Update media bluetooth icons.
Note + bt logo.

Bug: 19260237
Change-Id: I32cb497505f7dea94d761637064f8f8e585ffa94
2015-04-09 22:06:10 -04:00
John Spurlock
ec88e8956c Merge "An update on Downtime." 2015-04-10 01:48:06 +00:00
John Spurlock
b2278d6571 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
2015-04-09 21:45:08 -04:00
Tim Murray
72fcf9eb10 am af61d43d: am 6d718c2f: Merge "Add support for setting the cache directory."
* commit 'af61d43d6ce065832f906757c2185c3dad74d489':
  Add support for setting the cache directory.
2015-04-10 01:30:14 +00:00
Tim Murray
af61d43d6c am 6d718c2f: Merge "Add support for setting the cache directory."
* commit '6d718c2f43f6be057f9a519bc02f6b123405b79d':
  Add support for setting the cache directory.
2015-04-10 01:07:26 +00:00
Tim Murray
6d718c2f43 Merge "Add support for setting the cache directory." 2015-04-10 00:51:15 +00:00
Tim Murray
47f31582b6 Add support for setting the cache directory.
Change-Id: I2bf1874705b877a8a8262ab49b47fe8241e603d5
2015-04-09 17:50:39 -07:00
Alex Klyubin
037dfb9423 am 5f8c17b9: am ba2836e6: Merge "Track recent keymaster_defs.h changes."
* commit '5f8c17b9f6d574eca6a24ddb2f7cc98a37f5aaea':
  Track recent keymaster_defs.h changes.
2015-04-10 00:35:55 +00:00
Adam Lesinski
a826c4b7a4 Merge "Add PNG and 9-patch support" 2015-04-10 00:32:28 +00:00