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

212251 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
82c0f1c413 am 62679a1f: (-s ours) am c095272a: (-s ours) am 7013f0c8: (-s ours) Import translations. DO NOT MERGE 
* commit '62679a1f6d04a554e452b5126ccb784c3870a035':
  Import translations. DO NOT MERGE
 2015-10-14 14:17:05 +00:00
Geoff Mendal
62679a1f6d am c095272a: (-s ours) am 7013f0c8: (-s ours) Import translations. DO NOT MERGE 
* commit 'c095272a807880bca2848b102438ec9a13dec749':
  Import translations. DO NOT MERGE
 2015-10-14 14:13:42 +00:00
Geoff Mendal
c095272a80 am 7013f0c8: (-s ours) Import translations. DO NOT MERGE 
* commit '7013f0c8f2adcc14acd052f4066827ad31f17195':
  Import translations. DO NOT MERGE
 2015-10-14 14:07:29 +00:00
Geoff Mendal
7013f0c8f2 Import translations. DO NOT MERGE 
Change-Id: Iefcade8293a0fa228423e3eef730910af4a76853
Auto-generated-cl: translation import
 2015-10-14 06:59:48 -07:00
Matthew Williams
70facd5836 am f23e617b: am 6c8ddfcc: am 40ec3a92: Merge "Correctly reschedule failed periodic" into mnc-dr-dev 
* commit 'f23e617bcd8090ef96a5449907c4db39f7efb6a5':
  Correctly reschedule failed periodic
 2015-10-14 03:16:32 +00:00
Matthew Williams
f23e617bcd am 6c8ddfcc: am 40ec3a92: Merge "Correctly reschedule failed periodic" into mnc-dr-dev 
* commit '6c8ddfcc5a34af2dd3c28c7b1c46ab51967b3213':
  Correctly reschedule failed periodic
 2015-10-14 03:10:08 +00:00
Matthew Williams
6c8ddfcc5a am 40ec3a92: Merge "Correctly reschedule failed periodic" into mnc-dr-dev 
* commit '40ec3a924663c831e47f5e851b2978b96ff428fb':
  Correctly reschedule failed periodic
 2015-10-14 03:03:42 +00:00
Matthew Williams
40ec3a9246 Merge "Correctly reschedule failed periodic" into mnc-dr-dev 2015-10-14 03:00:16 +00:00
Jean-Michel Trivi
6135f32004 am acb867f1: am bf76eb7c: am a2ed535c: NotificationPlayer supports MediaPlayer errors 
* commit 'acb867f17c34828d14b3c71186253a269d85707c':
  NotificationPlayer supports MediaPlayer errors
 2015-10-14 01:32:38 +00:00
Jean-Michel Trivi
acb867f17c am bf76eb7c: am a2ed535c: NotificationPlayer supports MediaPlayer errors 
* commit 'bf76eb7cdaf1e2199217354bd6cbeaf37657486f':
  NotificationPlayer supports MediaPlayer errors
 2015-10-14 01:27:30 +00:00
Jean-Michel Trivi
bf76eb7cda am a2ed535c: NotificationPlayer supports MediaPlayer errors 
* commit 'a2ed535c67a6c6fbe2ae4a086193ad68711e2129':
  NotificationPlayer supports MediaPlayer errors
 2015-10-14 01:22:32 +00:00
Adrian Roos
5ca3080825 am f3c9215a: am 66536146: am 4673b259: Merge "Show charging speed in all locales" into mnc-dr-dev 
* commit 'f3c9215afbd3b0100a7762a91d7e4db56b902224':
  Show charging speed in all locales
 2015-10-13 23:13:25 +00:00
Michael Lentine
5f49de1ed1 am 83663c5b: am 202538ee: am 50e79632: Merge "Remove ColorFade resouces when screen off." into mnc-dr-dev 
* commit '83663c5b6871f7cf01fe2378a54d2c27cb98c832':
  Remove ColorFade resouces when screen off.
 2015-10-13 23:09:19 +00:00
Adrian Roos
f3c9215afb am 66536146: am 4673b259: Merge "Show charging speed in all locales" into mnc-dr-dev 
* commit '66536146bfeac90346b898f56c7e955ad83cd005':
  Show charging speed in all locales
 2015-10-13 23:08:26 +00:00
Adrian Roos
66536146bf am 4673b259: Merge "Show charging speed in all locales" into mnc-dr-dev 
* commit '4673b259bc1b362fee206c7476c5fde3f53b4e20':
  Show charging speed in all locales
 2015-10-13 23:01:55 +00:00
Michael Lentine
83663c5b68 am 202538ee: am 50e79632: Merge "Remove ColorFade resouces when screen off." into mnc-dr-dev 
* commit '202538eef0d9d9d40b650bdb1b449e1b404ed274':
  Remove ColorFade resouces when screen off.
 2015-10-13 23:01:28 +00:00
Jean-Michel Trivi
a2ed535c67 NotificationPlayer supports MediaPlayer errors 
If an error is reported while trying to play a notification,
 behave as if the playback had completed.

Bug 21093153

Change-Id: Iedc7691d0b8f4d68ad75cb04292a5d7d9350552f
(cherry picked from commit a25f6fcfed280136a16ce5800fcaabae17291dd7)
 2015-10-13 23:00:52 +00:00
Michael Lentine
202538eef0 am 50e79632: Merge "Remove ColorFade resouces when screen off." into mnc-dr-dev 
* commit '50e796326a39cd15af9031a41e3fe30b1f0f35f6':
  Remove ColorFade resouces when screen off.
 2015-10-13 22:57:11 +00:00
Adrian Roos
4673b259bc Merge "Show charging speed in all locales" into mnc-dr-dev 2015-10-13 22:55:11 +00:00
Michael Lentine
50e796326a Merge "Remove ColorFade resouces when screen off." into mnc-dr-dev 2015-10-13 22:51:12 +00:00
Wei Jia
92a1b8cab2 am 559f28ec: am d32df662: am de612dc1: MediaPlayer: remove obsolete function setPlaybackRate from comments. 
* commit '559f28ec67636f7bed82550be7590db46b47f1d0':
  MediaPlayer: remove obsolete function setPlaybackRate from comments.
 2015-10-13 22:02:44 +00:00
Adrian Roos
f142cac734 Show charging speed in all locales 
Bug: 24167496
Change-Id: I3e883eeca002e86d4df30c2b238e18bd63bbddea
 2015-10-13 21:54:36 +00:00
Wei Jia
559f28ec67 am d32df662: am de612dc1: MediaPlayer: remove obsolete function setPlaybackRate from comments. 
* commit 'd32df6623e78efc173e5ff2534056543f963a58a':
  MediaPlayer: remove obsolete function setPlaybackRate from comments.
 2015-10-13 21:52:33 +00:00
Wei Jia
d32df6623e am de612dc1: MediaPlayer: remove obsolete function setPlaybackRate from comments. 
* commit 'de612dc1d10d25e017ac911d0e7cca6709bdbb96':
  MediaPlayer: remove obsolete function setPlaybackRate from comments.
 2015-10-13 21:47:04 +00:00
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