drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
188,034 Commits 1 Branch 0 Tags
Commit Graph

188034 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav
caa41648f4 Merge "Allow only system signed apps to grant permissions at install" 2015-04-10 18:45:07 +00:00
Svetoslav
805b63e253 Allow only system signed apps to grant permissions at install 
bug:20099946

Change-Id: Ifcc5c6638b4174ffb3ba452ae68a5a53b2d1ff0a
 2015-04-10 11:41:29 -07:00
Ashutosh Joshi
c5d8d88b12 Merge "Adding a feature string for high capability sensors." 2015-04-10 18:36:43 +00:00
Alex Klyubin
75f6f31db4 am d31d4771: am c5f9683c: am a270264c: Merge "Track more changes to keymaster_defs.h" 
* commit 'd31d4771d90277eb246814b6a6f981e0842eb614':
  Track more changes to keymaster_defs.h
 2015-04-10 18:29:53 +00:00
Alex Klyubin
d31d4771d9 am c5f9683c: am a270264c: Merge "Track more changes to keymaster_defs.h" 
* commit 'c5f9683c065e6ddf906a354603d19ce57448993f':
  Track more changes to keymaster_defs.h
 2015-04-10 18:18:42 +00:00
Alex Klyubin
c5f9683c06 am a270264c: Merge "Track more changes to keymaster_defs.h" 
* commit 'a270264c61daa42a5b03bbb1e7f23e77780f8fc0':
  Track more changes to keymaster_defs.h
 2015-04-10 18:09:27 +00:00
Alex Klyubin
a270264c61 Merge "Track more changes to keymaster_defs.h" 2015-04-10 17:51:49 +00:00
Alan Viverette
d18c59b3e6 Merge "Don't change state when inflating LayerDrawable" 2015-04-10 17:50:21 +00:00
Scott Kennedy
bb0acea215 Merge "Fix a typo in BluetoothLeScanner documentation" 2015-04-10 17:38:52 +00:00
Ben Kwa
23f5ca6dc8 Merge "Enable directory copying." 2015-04-10 17:33:44 +00:00
Nancy Chen
e42c9c7ff9 Merge "Create interface for SmsManager text sending methods." 2015-04-10 17:32:24 +00:00
Ben Kwa
726cf70fd4 Enable directory copying. 
- Enable directory picking for copying.
- Implement recursive copying inside the CopyService.
  - Pretty up the notification (use an indeterminate notification while
    calculating copy size)
  - Do two recursive walks: one to determine the size of the copy job,
    and then another to actually copy the files.
- Switch to using ContentProviderClient instances, for better error
  detection and handling
- Disable copying from the Recents view.

Change-Id: Ieb38cca80edf84a487547b68f0d6b328fc4d7701
 2015-04-10 10:28:22 -07:00
Scott Kennedy
e7b03631d2 Fix a typo in BluetoothLeScanner documentation 
Change-Id: Id19dae9a583c0ef621789604277e3f6c6aead80c
 2015-04-10 10:25:34 -07:00
Clara Bayarri
94bf0d9157 Merge "Editor: Account for a split cursor in the content rect calculation" 2015-04-10 17:22:42 +00:00
Doris Liu
fe928dac69 Merge "Add a check for color type in property values holder" 2015-04-10 17:19:43 +00:00
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
Ashutosh Joshi
eae371bf6f Adding a feature string for high capability sensors. 
Adding a feature string for higher capability sensor platforms.
The string is supposed to signal the availability of lower power and
higher accuracy sensor processing on a supporting device.

Change-Id: I8093065278589fc9cc41fcc7f9b898c7eae20dff
 2015-04-10 09:33:16 -07: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
Alex Klyubin
55f7c2770f Track more changes to keymaster_defs.h 
KeyStoreTest needed to be adjusted because OCB is no longer supported.

Bug: 18088752
Change-Id: I7594daaa5e97423d34726b07cc79e3ee28418d95
 2015-04-10 08:58:38 -07: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
Clara Bayarri
b7419dd76e Editor: Account for a split cursor in the content rect calculation 
In some cases, the cursor in a TextView is split. This happens with
RTL languages. For this case we need to ensure neither of the half
cursors is obscured by the Floating Toolbar, hence we take the
minimal rectangle that contains both cursors as the content rect.

Change-Id: I2ce411793fcba2140c4ad7fb7caaf03593620484
 2015-04-10 15:45:07 +01: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