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

65592 Commits

Author SHA1 Message Date
Mike Lockwood
dea9dbe631 Merge "MidiManager updates:" 2015-01-15 01:32:52 +00:00
Mike Lockwood
10024b3dc1 MidiManager updates: 
MIDI ports are now implemented as file descriptors directly between the sender
and receiver, so the MidiService is no longer in the message path.

To facilitate the above, each port has its own file descriptor, rather than multiplexing
all ports on a device through a single socket.

Added a new class MidiDeviceServer, which is used by implementors of MIDI devices.
This replaces the MidiVirtualDevice class (which only was included in changes that were reviewed but never submitted).

The USB MIDI implementation has moved from the MIDI service to the USB service.
The USB MIDI implementation uses MidiDeviceServer as its interface, so we now have a common
interface for all MIDI device implementations.

Change-Id: I8effd1583f344beb6c940c3a24dbf20b477a6436
 2015-01-14 16:51:54 -08:00
Jorim Jaggi
568e54be71 resolve merge conflicts of 87f5369 to master. 
Change-Id: I5d1a7aaf48c4bf70f7181508aa46fbbcc2cf7086
 2015-01-15 00:12:18 +01:00
Adrian Roos
4bc5b2bce9 Merge "LockPatternUtils clean up continued" 2015-01-14 22:32:08 +00:00
Adrian Roos
9dd16ebcf2 LockPatternUtils clean up continued 
- Deprecate Settings.Secure.LOCK_PATTERN_ENABLED
- Remove unused permanent lock out
- Disallow empty/null arguments to saveLockPattern and saveLockPassword
- Refactor repeated quality checks

Change-Id: I6f369eb60f8f6bb1e33384cd06534c713ab52e79
 2015-01-14 22:51:31 +01:00
Adrian Roos
dd6961d768 Merge "Explicitly specify user on LPU's private methods" 2015-01-14 20:49:13 +00:00
Adrian Roos
bb4bc22021 Merge "Directly dispatch USER_REMOVED to LockSettingsService" 2015-01-14 20:45:42 +00:00
Adrian Roos
0791e8fb30 Merge "Purge biometric weak and keyguard widgets" 2015-01-14 20:41:35 +00:00
Nicolas Prevot
f23f355645 am 206d31f5: am 42ebaa43: Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev 
* commit '206d31f598d499dd5a8659235afada35c3417f94':
  Make documentation for cross-profile intent filters clearer.
 2015-01-14 19:24:16 +00:00
Alan Viverette
34b064a140 Merge "Clean up TypedArray docs & formatting, remove coercion warnings" 2015-01-14 18:44:37 +00:00
Andres Morales
349c504c00 Merge "Check bootimage build fingerprint against vendor" 2015-01-14 18:36:51 +00:00
Geoff Mendal
b4b04ea321 Merge "Import translations. DO NOT MERGE" 2015-01-14 18:22:17 +00:00
Geoff Mendal
5b5c2ed862 Import translations. DO NOT MERGE 
Change-Id: I0f555d349f3a7dbaefbc3ffd49033c97bbb0a4d2
Auto-generated-cl: translation import
 2015-01-14 10:21:29 -08:00
Andres Morales
cb3fd69458 Check bootimage build fingerprint against vendor 
Prevents image mismatch issues

Change-Id: Ibd972cbcedf1000bfe2a8ceed7696a229365dc25
 2015-01-14 10:16:49 -08:00
Derek Sollenberger
dbf22ccd92 Merge "Update HWUI to store its own SkBitmap objects" 2015-01-14 15:06:27 +00:00
Nicolas Prevot
206d31f598 am 42ebaa43: Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev 
* commit '42ebaa434f95417cbf55ef6975fab7cb9d27ab3e':
  Make documentation for cross-profile intent filters clearer.
 2015-01-14 13:38:21 +00:00
Nicolas Prevot
42ebaa434f Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev 2015-01-14 13:33:13 +00:00
Wink Saville
691d9f9eaf am 657f9a68: am 1a6dd298: Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev 
* commit '657f9a680fd1a82d83b7f8b7658388ea3456ee86':
  StateMachine.dump produces no output sometimes.
 2015-01-14 12:06:22 +00:00
Wink Saville
657f9a680f am 1a6dd298: Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev 
* commit '1a6dd2985ef1eab036f6fc77cf723e3f12832e93':
  StateMachine.dump produces no output sometimes.
 2015-01-14 11:59:41 +00:00
Nicolas Prevot
2c1c5dd5ef Make documentation for cross-profile intent filters clearer. 
Explain why FLAG_MANAGED_CAN_ACCESS_PARENT and FLAG_PARENT_CAN_ACCESS_MANAGED
have these names.
Also do not mention the disambiguation list since there is not always a
disambiguation list shown when resolving cross-profile intent filters.

BUG:18962528

Change-Id: Ibbb9505dcab7cf17d87435eff2cef3e745e95209
 2015-01-14 10:31:23 +00:00
Alan Viverette
b2b98a00e1 Force-commit changes on accept in spinner-style DatePickerDialog 
Bug: 19005472
Change-Id: If500c7305282a5055b4617c242871e04d91c0bc3
 2015-01-13 17:34:17 -08:00
Wink Saville
1a6dd2985e Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev 2015-01-14 00:52:08 +00:00
Wink Saville
54b1b1a07a StateMachine.dump produces no output sometimes. 
If the content to dump is large no output is produced by dump. Change
back to using a loop and flush.

Bug: 18965342
Change-Id: Ibc33da8bfffd5f998a78df0e2d70ed8e8a0aa137
 2015-01-13 22:35:25 +00:00
Bryce Lee
e843e24681 am 9320e9f0: Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev automerge: e036ce2 
automerge: 7e6fbb3

* commit '7e6fbb361be7a0045b8c71f0b8c56f113121a7d4':
  Update javadoc for DEFAULT_FEATURES deprecation.
 2015-01-13 21:07:16 +00:00
Adam Powell
9a67d191ab am 69c22e82: Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout" into lmp-mr1-dev automerge: 57744dd 
automerge: 1accc9c

* commit '1accc9c12ba9610bc592666c5f46be727f92e68d':
  Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout
 2015-01-13 21:05:50 +00:00
Nicolas Prévot
fa58f454c1 am 6478b4f1: Merge "Clarify docs for user restrictions" into lmp-mr1-dev automerge: 6ab76bd automerge: e5d3ee8 
* commit '6478b4f19a527b0ca26485aaac477e4d4c83a5d5':
  Clarify docs for user restrictions
 2015-01-13 20:33:24 +00:00
Craig Mautner
91934a3b2f am 19c549fc: am 1e263d3f: am 66b4d484: Merge "Prevent system server dump stuck by pipe buffer full." 
* commit '19c549fc735bf8a1df5cccb6cc0cdf46c7d242a4':
  Prevent system server dump stuck by pipe buffer full.
 2015-01-13 20:33:08 +00:00
Alan Viverette
cb4a489fd1 am 4ecb5fb2: am 82bdfcfa: Update docs for Window.setElevation(), apply changes immediately automerge: 71922de 
* commit '4ecb5fb288fd9994e7b2ec0091fbbcdc81f69526':
  Update docs for Window.setElevation(), apply changes immediately
 2015-01-13 20:33:02 +00:00
Wale Ogunwale
3c0e7e908f am 00c85656: am 42b0d10a: am 1ea6afe1: Merge "Don\'t allow windows with invalid types to be added." into lmp-mr1-dev 
* commit '00c8565614d3555e723ff3d8dad3af92d69d81ea':
  Don't allow windows with invalid types to be added.
 2015-01-13 20:32:07 +00:00
Olawale Ogunwale
be37df395e am 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG receiver finished" 
automerge: 0f8ecc8

* commit '0f8ecc84c8b86054bfd3275f942c3a705df01fbb':
  [ActivityManager] Distinguish FG or BG receiver finished
 2015-01-13 20:19:57 +00:00
Bryce Lee
7e6fbb361b am 9320e9f0: Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev 
automerge: e036ce2

* commit 'e036ce2e7044efcc8be71241a7e0a1523955f20c':
  Update javadoc for DEFAULT_FEATURES deprecation.
 2015-01-13 19:05:15 +00:00
Adam Powell
1accc9c12b am 69c22e82: Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout" into lmp-mr1-dev 
automerge: 57744dd

* commit '57744dd139f3d30ed1031319dd64b289a68ac3ba':
  Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout
 2015-01-13 19:03:36 +00:00
Bryce Lee
e036ce2e70 am 9320e9f0: Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev 
* commit '9320e9f0a6af9269bc145ec7ab3d4b351f0614af':
  Update javadoc for DEFAULT_FEATURES deprecation.
 2015-01-13 19:01:24 +00:00
Adam Powell
57744dd139 am 69c22e82: Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout" into lmp-mr1-dev 
* commit '69c22e82e9c3e95f4689a57320de3199ffd29262':
  Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout
 2015-01-13 19:01:19 +00:00
Bryce Lee
9320e9f0a6 Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev 2015-01-13 18:59:36 +00:00
Adam Powell
69c22e82e9 Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout" into lmp-mr1-dev 2015-01-13 18:57:33 +00:00
Nicolas Prévot
6478b4f19a Merge "Clarify docs for user restrictions" into lmp-mr1-dev automerge: 6ab76bd 
automerge: e5d3ee8

* commit 'e5d3ee8e4fae72ef554a0e1084e88aea9ed8f020':
  Clarify docs for user restrictions
 2015-01-13 17:44:21 +00:00
Nicolas Prévot
e5d3ee8e4f Merge "Clarify docs for user restrictions" into lmp-mr1-dev 
automerge: 6ab76bd

* commit '6ab76bd434d587fecefd5801905b09bcd32b1661':
  Clarify docs for user restrictions
 2015-01-13 17:39:34 +00:00
Nicolas Prévot
6ab76bd434 Merge "Clarify docs for user restrictions" into lmp-mr1-dev 2015-01-13 17:35:14 +00:00
Bryce Lee
aa1008cba4 Update javadoc for DEFAULT_FEATURES deprecation. 
Bug: 18983343
Change-Id: I10936e292edf9146e7acca231632fb704054215c
 2015-01-13 09:26:46 -08:00
Amith Yamasani
150514bd03 Clarify docs for user restrictions 
Specify which restrictions are not relevant or behave differently
for managed profiles.

Bug: 18768578
Change-Id: Iac1435c5b931cbb889902a9b9e427bc0e0778bf2
 2015-01-13 16:04:42 +00:00
Craig Mautner
19c549fc73 am 1e263d3f: am 66b4d484: Merge "Prevent system server dump stuck by pipe buffer full." 
* commit '1e263d3f140e90966790875a815f23c92550f2f2':
  Prevent system server dump stuck by pipe buffer full.
 2015-01-13 04:20:23 +00:00
Craig Mautner
66b4d48469 Merge "Prevent system server dump stuck by pipe buffer full." 2015-01-13 04:08:05 +00:00
Alan Viverette
4ecb5fb288 am 82bdfcfa: Update docs for Window.setElevation(), apply changes immediately automerge: 71922de 
* commit '82bdfcfadc17b8467a0e3c50843997e7957a9452':
  Update docs for Window.setElevation(), apply changes immediately
 2015-01-13 02:24:11 +00:00
Alan Viverette
82bdfcfadc Update docs for Window.setElevation(), apply changes immediately 
automerge: 71922de

* commit '71922de6c8e407ff24bb1a500cb53bb1a647c758':
  Update docs for Window.setElevation(), apply changes immediately
 2015-01-13 02:16:32 +00:00
Alan Viverette
71922de6c8 Update docs for Window.setElevation(), apply changes immediately 
BUG: 18983689
Change-Id: I471104092d6296dc0ba2689da96783be088fbce8
 2015-01-12 16:14:02 -08:00
Ben Wagner
c2d39573ca Remove dead code from AssetStreamAdapter. 
After "Use at least SkStreamAsset for SkTypefaces." there is now dead
code in AssetStreamAdapter. Remove the code and update the users.

Change-Id: I17a9d82dd6ca4d87a951c1570dc91de7f2fc54f2
 2015-01-12 18:13:27 -05:00
Wale Ogunwale
00c8565614 am 42b0d10a: am 1ea6afe1: Merge "Don\'t allow windows with invalid types to be added." into lmp-mr1-dev 
* commit '42b0d10a83dae285a3d3af9911aa35a90db203d0':
  Don't allow windows with invalid types to be added.
 2015-01-12 22:22:05 +00:00
Wale Ogunwale
42b0d10a83 am 1ea6afe1: Merge "Don\'t allow windows with invalid types to be added." into lmp-mr1-dev 
* commit '1ea6afe1234b04de0f5b3f9ac5802b1c6d42e8ac':
  Don't allow windows with invalid types to be added.
 2015-01-12 22:15:58 +00:00
Wale Ogunwale
1ea6afe123 Merge "Don't allow windows with invalid types to be added." into lmp-mr1-dev 2015-01-12 22:03:50 +00:00