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

212327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wei Liu
2bc05482f8 am 595a93ec: am 430a769a: Merge "Use wear style dialog for ICC hotswap restart dialog." into cw-e-dev 
* commit '595a93ec03ec3ff5785032db04a087cdeafa2fe2':
  Use wear style dialog for ICC hotswap restart dialog.
 2015-10-13 21:36:28 +00:00
Michael Lentine
d73854dbfd Remove ColorFade resouces when screen off. 
This will not destroy the surface but will free up everything else used by
ColorFade when the screen is turned off. When it is turned on the surface is
dismissed.

Bug: 24371570

Change-Id: Iba455cdf225a68b320896f8b35d1e873e694b1e3
 2015-10-13 14:35:18 -07:00
Wei Jia
de612dc1d1 MediaPlayer: remove obsolete function setPlaybackRate from comments. 
Bug: 24260668
Change-Id: I20733e52dbd2dab5eb10b4607a1c1aadb93a1332
(cherry picked from commit cd860ac06ca7a46e9638dd741ba731f066705eb5)
 2015-10-13 21:31:22 +00:00
Wei Liu
595a93ec03 am 430a769a: Merge "Use wear style dialog for ICC hotswap restart dialog." into cw-e-dev 
* commit '430a769a9485a31788670a353d6d47d704c432b8':
  Use wear style dialog for ICC hotswap restart dialog.
 2015-10-13 21:30:46 +00:00
Wei Liu
430a769a94 Merge "Use wear style dialog for ICC hotswap restart dialog." into cw-e-dev 2015-10-13 21:23:35 +00:00
Jeff Hao
9b10f2e1a7 am a14c5795: am 59e52b9f: am 1c33939b: Merge "Shorten first boot time by filtering dexopted apps by LRU." into mnc-dr-dev 
* commit 'a14c5795bb2e9fa4e63c5e35900c555a78b08896':
  Shorten first boot time by filtering dexopted apps by LRU.
 2015-10-13 20:11:44 +00:00
Jeff Hao
a14c5795bb am 59e52b9f: am 1c33939b: Merge "Shorten first boot time by filtering dexopted apps by LRU." into mnc-dr-dev 
* commit '59e52b9f000ea7be9f18e25f0f741ff442710ca2':
  Shorten first boot time by filtering dexopted apps by LRU.
 2015-10-13 20:05:56 +00:00
Jeff Hao
59e52b9f00 am 1c33939b: Merge "Shorten first boot time by filtering dexopted apps by LRU." into mnc-dr-dev 
* commit '1c33939be52a9b1d1c9881829236c014e9fb61b9':
  Shorten first boot time by filtering dexopted apps by LRU.
 2015-10-13 19:59:52 +00:00
Jeff Hao
1c33939be5 Merge "Shorten first boot time by filtering dexopted apps by LRU." into mnc-dr-dev 2015-10-13 19:54:00 +00:00
Phil Burk
246b66cbcb am 1bc47a6e: am bfaa71bb: am 8e82755d: Merge "BluetoothMidiDevice: change write type to support JamStik" into mnc-dr-dev 
* commit '1bc47a6e7020799ae7eb5ee3e91bc452144a3d64':
  BluetoothMidiDevice: change write type to support JamStik
 2015-10-13 18:58:26 +00:00
Phil Burk
1bc47a6e70 am bfaa71bb: am 8e82755d: Merge "BluetoothMidiDevice: change write type to support JamStik" into mnc-dr-dev 
* commit 'bfaa71bb316552236c78de87a96f0ee722133e78':
  BluetoothMidiDevice: change write type to support JamStik
 2015-10-13 18:50:54 +00:00
Phil Burk
bfaa71bb31 am 8e82755d: Merge "BluetoothMidiDevice: change write type to support JamStik" into mnc-dr-dev 
* commit '8e82755dfdfee837cb73d3db3f6319301d2a5903':
  BluetoothMidiDevice: change write type to support JamStik
 2015-10-13 18:43:35 +00:00
Phil Burk
8e82755dfd Merge "BluetoothMidiDevice: change write type to support JamStik" into mnc-dr-dev 2015-10-13 18:36:13 +00:00
Phil Burk
61cf82778f am 92ae0a54: am 7bbb6fed: am 977fe03b: BLE-MIDI: change binding for BluetoothMidiService 
* commit '92ae0a5480f8ac2107688bf2f6bb58d49cb52bd1':
  BLE-MIDI: change binding for BluetoothMidiService
 2015-10-13 18:21:44 +00:00
Phil Burk
92ae0a5480 am 7bbb6fed: am 977fe03b: BLE-MIDI: change binding for BluetoothMidiService 
* commit '7bbb6fedbcce05cd712b464cecbdbd80e28a6b4e':
  BLE-MIDI: change binding for BluetoothMidiService
 2015-10-13 18:15:51 +00:00
Phil Burk
7bbb6fedbc am 977fe03b: BLE-MIDI: change binding for BluetoothMidiService 
* commit '977fe03b36a7783f9cee8497efe550a69b128473':
  BLE-MIDI: change binding for BluetoothMidiService
 2015-10-13 18:10:29 +00:00
Jeff Hao
71d3260ffa Shorten first boot time by filtering dexopted apps by LRU. 
No longer dexopt all system apps and boot listener user apps.

Bug: 23628238
Bug: https://code.google.com/p/android/issues/detail?id=186589

(cherry-picked from commit b84cb9e9719855d56ea74c2eb7afc49034c0e66f)

Change-Id: Id1a1ca9f46777f9e62df3d4f25e98a2837fabf37
 2015-10-13 17:49:15 +00:00
Wei Liu
4f1cbad283 Use wear style dialog for ICC hotswap restart dialog. 
b/24719054

Change-Id: I0ce6b3064959dfd2dd1a4f89e76fcc87a0d4810c
 2015-10-13 10:20:13 -07:00
Ronghua Wu
f807c4fc9e am c2fd35f7: am 57c332bd: am c024de3c: media: ignore null InputStream 
* commit 'c2fd35f7ae51d83b3d8f7f46c70e351bf0f18235':
  media: ignore null InputStream
 2015-10-13 15:50:57 +00:00
Ronghua Wu
c2fd35f7ae am 57c332bd: am c024de3c: media: ignore null InputStream 
* commit '57c332bd4ad9a2120e5ca93ae5ce9175913aeedd':
  media: ignore null InputStream
 2015-10-13 15:46:00 +00:00
Ronghua Wu
57c332bd4a am c024de3c: media: ignore null InputStream 
* commit 'c024de3c946c18e8e4799eb8d372fdec3146f8cf':
  media: ignore null InputStream
 2015-10-13 15:40:48 +00:00
Phil Burk
977fe03b36 BLE-MIDI: change binding for BluetoothMidiService 
Add a remote call addBluetoothDevice() using AIDL.
This was needed because onBind() is only called once.

Bug: 23219556
Bug: 23760886
Change-Id: Id7554ca55d596352d11dbd6ae3e403138a29c864
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit 7cd06c0b9e087a555d2c5dd4cab5b7eac8497526)
 2015-10-13 15:40:03 +00:00
Ronghua Wu
c024de3c94 media: ignore null InputStream 
Bug: 22854896
Change-Id: I20b9e28bbba6dec73538ee6937d337c2e2b971f4
 2015-10-13 15:29:42 +00:00
Lorenzo Colitti
9b23f88552 Don't crash if an invalid always-on VPN profile is configured. 
This is currently being hit because Settings does not clear the
always-on VPN configuration when the corresponding VPN profile is
deleted. This will be fixed in Settings, but there's no harm in
being robust to invalid configurations here.

Bug: 23625458
Change-Id: Id185a54d5892339197cd40026df5174debd957cf
 2015-10-13 15:29:14 +09:00
Eric Laurent
ac86c21c4c am 8738d736: am a14d1bd7: am c1c462cb: Merge "MidiBluetoothService: add new device to HashMap" into mnc-dr-dev 
* commit '8738d736592554d9a814a3cbd676206992fd81a0':
  MidiBluetoothService: add new device to HashMap
 2015-10-13 01:41:30 +00:00
Eric Laurent
8738d73659 am a14d1bd7: am c1c462cb: Merge "MidiBluetoothService: add new device to HashMap" into mnc-dr-dev 
* commit 'a14d1bd798ca38f24b2f489ad7f32dff700b141e':
  MidiBluetoothService: add new device to HashMap
 2015-10-13 01:22:44 +00:00
Yohei Yukawa
52c77a29ba am 4299751a: am 5b53211a: am ce42e922: Merge "Unbind IME client when unsetting the current IME." into mnc-dr-dev 
* commit '4299751addad35938e1195cc641e2682b171fc94':
  Unbind IME client when unsetting the current IME.
 2015-10-13 01:18:43 +00:00
Eric Laurent
a14d1bd798 am c1c462cb: Merge "MidiBluetoothService: add new device to HashMap" into mnc-dr-dev 
* commit 'c1c462cbaa8b65c6240f947de503619482296222':
  MidiBluetoothService: add new device to HashMap
 2015-10-13 01:16:56 +00:00
Yohei Yukawa
4299751add am 5b53211a: am ce42e922: Merge "Unbind IME client when unsetting the current IME." into mnc-dr-dev 
* commit '5b53211a8e0b79a4fa7d8a5dad41bcf86f1ab9fe':
  Unbind IME client when unsetting the current IME.
 2015-10-13 01:14:23 +00:00
Eric Laurent
c1c462cbaa Merge "MidiBluetoothService: add new device to HashMap" into mnc-dr-dev 2015-10-13 01:09:32 +00:00
Yohei Yukawa
5b53211a8e am ce42e922: Merge "Unbind IME client when unsetting the current IME." into mnc-dr-dev 
* commit 'ce42e922197bd39276c642f3759c2a053f673d82':
  Unbind IME client when unsetting the current IME.
 2015-10-13 01:07:20 +00:00
Yohei Yukawa
ce42e92219 Merge "Unbind IME client when unsetting the current IME." into mnc-dr-dev 2015-10-13 01:00:30 +00:00
Svetoslav Ganov
5d6d298823 am d93e404e: am 1b872618: am 7a097ff1: Merge "Shared user retains permissions no longer used by any app on an app update" into mnc-dr-dev 
* commit 'd93e404ef27f5589248630a13f4bbac6ead9ff52':
  Shared user retains permissions no longer used by any app on an app update
 2015-10-13 00:20:58 +00:00
Adam Powell
d86a7f4cf7 am 1901a9e1: am 40ce70c9: am 11af1878: Merge "Add animation and positional stability to intent chooser UI" into mnc-dr-dev 
* commit '1901a9e199eee9102c829413528029dc25855987':
  Add animation and positional stability to intent chooser UI
 2015-10-13 00:20:51 +00:00
Dianne Hackborn
a7036ce15a am 05222c34: am 829920ed: am 34c120dc: Merge ""Fix" issue #24357296: Debug.getMemoryInfo doesn\'t include EGL mtrack..." into mnc-dr-dev 
* commit '05222c3440d1ba207fe6f87037a8297f33f3318a':
  "Fix" issue #24357296: Debug.getMemoryInfo doesn't include EGL mtrack...
 2015-10-13 00:20:42 +00:00
Adam Lesinski
ae9ae6c598 am 56f9a422: am 1c9d43eb: am bde2707f: Merge "Add additional density enums to android:screenDensity attribute" into mnc-dr-dev 
* commit '56f9a422be2d600da48d559e4838d07a44676c72':
  Add additional density enums to android:screenDensity attribute
 2015-10-13 00:20:24 +00:00
Phil Burk
42fcca169c am ff1e8f7e: am 1b3eb741: am ca296978: Merge "MidiManager: fix double BTLE callback" into mnc-dr-dev 
* commit 'ff1e8f7eeeb037a296d1fe49600927b5665fe8b7':
  MidiManager: fix double BTLE callback
 2015-10-13 00:20:17 +00:00
Phil Burk
ae885d6520 am 69ddaafa: am 0a64b146: am e39def48: MidiService: update listener with current status when registered 
* commit '69ddaafac41a21b35b226ee22e189b9e7840e70f':
  MidiService: update listener with current status when registered
 2015-10-13 00:20:06 +00:00
Alan Viverette
bbd8315daa am ff953294: am d9635e60: am c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev 
* commit 'ff9532940084a89b4cfe89bc954e7d8af1c695f0':
  Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR
 2015-10-13 00:19:30 +00:00
Yohei Yukawa
739d0b0585 Unbind IME client when unsetting the current IME. 
This follows up Ia70b870723acf647e0c27f24aff91b40d6f85543.

In certain scenarios, only IMMS#mCurMethodId is cleared with null
while IMMS#mCurClient is still pointing to the last application.
This is problematic when IMMS#mCurClient matches
SystemConfig#getFixedImeApps(), because it means that the current
IME is to be fixed to null.

With this CL, IMMS#unbindCurrentClientLocked() is always called
every time when IMMS#mCurMethodId is cleared to null.  Note that
clearing IMMS#mCurMethodId to null is a kind of hard-reset, where
unbinding IME client should make much sense in terms of robust
and predictable state management.

Bug: 18056075
Change-Id: I6c3186050592526fc95c5b27f18e2155acff5ebc
(cherry picked from commit e13a20faccf6f33aa43c9c1fa4c4ec2a79b86cfb)
 2015-10-12 17:08:59 -07:00
Winson
c14a11e882 Ensure we update the active pointer id on pointer up/down. 
Bug: 24841350
Change-Id: Id5d91ee8adbb638caf66976d701cfbc0befaca04
 2015-10-12 23:54:59 +00:00
Svetoslav Ganov
d93e404ef2 am 1b872618: am 7a097ff1: Merge "Shared user retains permissions no longer used by any app on an app update" into mnc-dr-dev 
* commit '1b8726182288900a0248c7a720a05f3d9c0e139e':
  Shared user retains permissions no longer used by any app on an app update
 2015-10-12 23:49:36 +00:00
Svetoslav Ganov
1b87261822 am 7a097ff1: Merge "Shared user retains permissions no longer used by any app on an app update" into mnc-dr-dev 
* commit '7a097ff159466c4e887f1c821aeaa545f80e54b6':
  Shared user retains permissions no longer used by any app on an app update
 2015-10-12 23:42:22 +00:00
Adam Powell
1901a9e199 am 40ce70c9: am 11af1878: Merge "Add animation and positional stability to intent chooser UI" into mnc-dr-dev 
* commit '40ce70c9c00144ede8d415a92dc411a53f2316f4':
  Add animation and positional stability to intent chooser UI
 2015-10-12 23:40:07 +00:00
Svetoslav Ganov
7a097ff159 Merge "Shared user retains permissions no longer used by any app on an app update" into mnc-dr-dev 2015-10-12 23:39:14 +00:00
Adam Powell
40ce70c9c0 am 11af1878: Merge "Add animation and positional stability to intent chooser UI" into mnc-dr-dev 
* commit '11af18783d32f8646428500a0ff3a2a57a77bf95':
  Add animation and positional stability to intent chooser UI
 2015-10-12 23:33:22 +00:00
Phil Burk
af3e489c1e BluetoothMidiDevice: change write type to support JamStik 
Temporarily use a Request instead of a Command so that the JamStik
will be properly enabled.

Bug: 24207964
Change-Id: I3d11732958c46e6039405b5969d5af0db8032fb9
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit 95129f50c68c734c5ebdf32ff6b8b9c63cc1ada7)
 2015-10-12 23:29:46 +00:00
Adam Powell
11af18783d Merge "Add animation and positional stability to intent chooser UI" into mnc-dr-dev 2015-10-12 23:28:36 +00:00
Dianne Hackborn
05222c3440 am 829920ed: am 34c120dc: Merge ""Fix" issue #24357296: Debug.getMemoryInfo doesn\'t include EGL mtrack..." into mnc-dr-dev 
* commit '829920ede03dbfd51f803940faa27fa7bf15063c':
  "Fix" issue #24357296: Debug.getMemoryInfo doesn't include EGL mtrack...
 2015-10-12 23:05:51 +00:00
Svetoslav
ff7b92fc02 Shared user retains permissions no longer used by any app on an app update 
If an app in a shared user uses permission A and B and these are granted
to the shared user and now an app update is installed that only uses A,
the shared user still ratains the B grant. A shared user should have only
permissions declared as used by its currenlty installed apps.

bug:24736912

Change-Id: Idea6c06bdc236fd481a860cddb379e6ce660ee87
 2015-10-12 16:04:34 -07:00