OSDN Git Service
Adam Powell [Thu, 15 Oct 2015 00:08:14 +0000 (00:08 +0000)]
am
bd4d81b0: am
b248077a: am
2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev
* commit '
bd4d81b08cc5d961da294c683a73c6c13e3eb931':
Fix bugs introduced in ChooserActivity
Adam Powell [Thu, 15 Oct 2015 00:01:29 +0000 (00:01 +0000)]
am
b248077a: am
2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev
* commit '
b248077a8a239fe6fe28775a7472a89ff42fdec3':
Fix bugs introduced in ChooserActivity
Amit Mahajan [Wed, 14 Oct 2015 23:54:08 +0000 (23:54 +0000)]
am
a41ea5e9: am
8fb8c37c: am
7b28e6ec: Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev
* commit '
a41ea5e95092674983ab4ae97788184c27ed64b6':
Adding config to allow/disallow user to add APNs.
Adam Powell [Wed, 14 Oct 2015 23:52:14 +0000 (23:52 +0000)]
am
2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev
* commit '
2eac005bbfc94a774c0a3f870fd393a3e7389f8c':
Fix bugs introduced in ChooserActivity
Amit Mahajan [Wed, 14 Oct 2015 23:50:11 +0000 (23:50 +0000)]
am
8fb8c37c: am
7b28e6ec: Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev
* commit '
8fb8c37ca7c2c57466b07548effa24044e5b3ef6':
Adding config to allow/disallow user to add APNs.
Adam Powell [Wed, 14 Oct 2015 23:46:32 +0000 (23:46 +0000)]
Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev
Amit Mahajan [Wed, 14 Oct 2015 23:42:13 +0000 (23:42 +0000)]
am
7b28e6ec: Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev
* commit '
7b28e6ec96dfcb20cef1f321ac7539bac439d726':
Adding config to allow/disallow user to add APNs.
Amit Mahajan [Wed, 14 Oct 2015 23:33:02 +0000 (23:33 +0000)]
Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev
Vineeta Srivastava [Wed, 14 Oct 2015 21:55:30 +0000 (21:55 +0000)]
am
ec3513e9: am
ecf89edf: am
8a586c55: Merge "TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar" into mnc-dr-dev
* commit '
ec3513e9af41ebc74d313d4039f510b87f8b244b':
TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar
Vineeta Srivastava [Wed, 14 Oct 2015 21:52:11 +0000 (21:52 +0000)]
am
ecf89edf: am
8a586c55: Merge "TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar" into mnc-dr-dev
* commit '
ecf89edf3616800cdacec000e112e487134adb64':
TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar
Vineeta Srivastava [Wed, 14 Oct 2015 21:45:06 +0000 (21:45 +0000)]
am
8a586c55: Merge "TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar" into mnc-dr-dev
* commit '
8a586c55022ee272bdcf712c7aa4e1652a261c5a':
TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar
Jeffrey Vander Stoep [Wed, 14 Oct 2015 21:44:31 +0000 (21:44 +0000)]
am
a2e511d6: am
8b626548: Merge "Pass privapp specifier for selinux labeling"
* commit '
a2e511d6ca6c3b3d465bbf2fe98f17e210c676d0':
Pass privapp specifier for selinux labeling
Vineeta Srivastava [Wed, 14 Oct 2015 21:39:08 +0000 (21:39 +0000)]
Merge "TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar" into mnc-dr-dev
Jeffrey Vander Stoep [Wed, 14 Oct 2015 21:38:41 +0000 (21:38 +0000)]
am
8b626548: Merge "Pass privapp specifier for selinux labeling"
* commit '
8b62654855b105e5ff7628107691309a63effe0c':
Pass privapp specifier for selinux labeling
Jeffrey Vander Stoep [Wed, 14 Oct 2015 21:33:59 +0000 (21:33 +0000)]
Merge "Pass privapp specifier for selinux labeling"
Roozbeh Pournader [Wed, 14 Oct 2015 21:24:12 +0000 (21:24 +0000)]
am
58de2861: am
6598022d: am
bdf952aa: Merge "Make Hyphenator#get() return an object." into mnc-dr-dev
* commit '
58de2861c0825eebcd8e56d2f747e93ebd03d4ae':
Make Hyphenator#get() return an object.
Roozbeh Pournader [Wed, 14 Oct 2015 21:18:39 +0000 (21:18 +0000)]
am
6598022d: am
bdf952aa: Merge "Make Hyphenator#get() return an object." into mnc-dr-dev
* commit '
6598022de5447691be3551d86ad31f2e3fe0e567':
Make Hyphenator#get() return an object.
Roozbeh Pournader [Wed, 14 Oct 2015 21:12:05 +0000 (21:12 +0000)]
am
bdf952aa: Merge "Make Hyphenator#get() return an object." into mnc-dr-dev
* commit '
bdf952aab732ebcaab0d785cd02ffb83e3738e21':
Make Hyphenator#get() return an object.
Roozbeh Pournader [Wed, 14 Oct 2015 21:07:13 +0000 (21:07 +0000)]
Merge "Make Hyphenator#get() return an object." into mnc-dr-dev
Winson Chung [Wed, 14 Oct 2015 20:58:48 +0000 (20:58 +0000)]
am
1c36cfd2: am
d8fed39f: am
c7a873e3: Merge "Ensure we update the active pointer id on pointer up/down." into mnc-dr-dev
* commit '
1c36cfd2102a136f80daef6bf1011503b4e5cca9':
Ensure we update the active pointer id on pointer up/down.
Winson Chung [Wed, 14 Oct 2015 20:52:20 +0000 (20:52 +0000)]
am
d8fed39f: am
c7a873e3: Merge "Ensure we update the active pointer id on pointer up/down." into mnc-dr-dev
* commit '
d8fed39f3c53cc7764e69a2a10ad3ece718179a2':
Ensure we update the active pointer id on pointer up/down.
Winson Chung [Wed, 14 Oct 2015 20:45:35 +0000 (20:45 +0000)]
am
c7a873e3: Merge "Ensure we update the active pointer id on pointer up/down." into mnc-dr-dev
* commit '
c7a873e356e1caa815c1830ae37a6ffb3ecf480f':
Ensure we update the active pointer id on pointer up/down.
Winson Chung [Wed, 14 Oct 2015 20:42:21 +0000 (20:42 +0000)]
Merge "Ensure we update the active pointer id on pointer up/down." into mnc-dr-dev
Adam Powell [Wed, 14 Oct 2015 20:10:18 +0000 (13:10 -0700)]
Fix bugs introduced in ChooserActivity
* Wait to start animations until all state has been initialized, as
the process of starting an Animator will set initial values,
triggering other events relying on the configured state.
* Correctly track underlying item indexes for columns.
* Do not over-extend the ResolverDrawerLayout when multiple rows
animate in.
Bug
24926885
Bug
24928706
Change-Id: I4772e1a0ba79b17b5dc19c778f3ef0cb5200c533
Roozbeh Pournader [Fri, 7 Aug 2015 22:13:30 +0000 (15:13 -0700)]
Make Hyphenator#get() return an object.
Previously, a native pointer was returned. After this change, callers
should call getNativePtr() if they want to get the native pointer instead.
Bug:
21492297
Bug:
24570591
Change-Id: I745bd88e6e8c86078fffb07f90f8d8f24215410c
(cherry picked from commit
e7eac6f540b09892172edd5b584605ea90f5a1ba)
Sungmin Choi [Tue, 13 Oct 2015 00:58:39 +0000 (17:58 -0700)]
TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar
Bug:
24850563
Change-Id: I36e54e9bde9610f908b1092e11c476dcae76526d
Signed-off-by: haesun.kim <haesun.kim@lge.com>
Signed-off-by: Sungmin Choi <sungmin.choi@lge.com>
Erik Kline [Wed, 14 Oct 2015 17:55:13 +0000 (17:55 +0000)]
am
9c8abd1d: am
f23eece2: am
b7e722b8: Merge "Don\'t crash if an invalid always-on VPN profile is configured." into mnc-dr-dev
* commit '
9c8abd1d7ab205047a7e0f131eca24b2f3019d5d':
Don't crash if an invalid always-on VPN profile is configured.
Erik Kline [Wed, 14 Oct 2015 17:48:48 +0000 (17:48 +0000)]
am
f23eece2: am
b7e722b8: Merge "Don\'t crash if an invalid always-on VPN profile is configured." into mnc-dr-dev
* commit '
f23eece2006f04785fa1b873afc66f01bb238e0b':
Don't crash if an invalid always-on VPN profile is configured.
Erik Kline [Wed, 14 Oct 2015 17:42:14 +0000 (17:42 +0000)]
am
b7e722b8: Merge "Don\'t crash if an invalid always-on VPN profile is configured." into mnc-dr-dev
* commit '
b7e722b88fab8b67f8a2ef54a7acb8c6672b6f46':
Don't crash if an invalid always-on VPN profile is configured.
Erik Kline [Wed, 14 Oct 2015 17:37:57 +0000 (17:37 +0000)]
Merge "Don't crash if an invalid always-on VPN profile is configured." into mnc-dr-dev
Geoff Mendal [Wed, 14 Oct 2015 14:17:05 +0000 (14:17 +0000)]
am
62679a1f: (-s ours) am
c095272a: (-s ours) am
7013f0c8: (-s ours) Import translations. DO NOT MERGE
* commit '
62679a1f6d04a554e452b5126ccb784c3870a035':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 14:13:42 +0000 (14:13 +0000)]
am
c095272a: (-s ours) am
7013f0c8: (-s ours) Import translations. DO NOT MERGE
* commit '
c095272a807880bca2848b102438ec9a13dec749':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 14:07:29 +0000 (14:07 +0000)]
am
7013f0c8: (-s ours) Import translations. DO NOT MERGE
* commit '
7013f0c8f2adcc14acd052f4066827ad31f17195':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 13:59:48 +0000 (06:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iefcade8293a0fa228423e3eef730910af4a76853
Auto-generated-cl: translation import
Matthew Williams [Wed, 14 Oct 2015 03:16:32 +0000 (03:16 +0000)]
am
f23e617b: am
6c8ddfcc: am
40ec3a92: Merge "Correctly reschedule failed periodic" into mnc-dr-dev
* commit '
f23e617bcd8090ef96a5449907c4db39f7efb6a5':
Correctly reschedule failed periodic
Matthew Williams [Wed, 14 Oct 2015 03:10:08 +0000 (03:10 +0000)]
am
6c8ddfcc: am
40ec3a92: Merge "Correctly reschedule failed periodic" into mnc-dr-dev
* commit '
6c8ddfcc5a34af2dd3c28c7b1c46ab51967b3213':
Correctly reschedule failed periodic
Matthew Williams [Wed, 14 Oct 2015 03:03:42 +0000 (03:03 +0000)]
am
40ec3a92: Merge "Correctly reschedule failed periodic" into mnc-dr-dev
* commit '
40ec3a924663c831e47f5e851b2978b96ff428fb':
Correctly reschedule failed periodic
Matthew Williams [Wed, 14 Oct 2015 03:00:16 +0000 (03:00 +0000)]
Merge "Correctly reschedule failed periodic" into mnc-dr-dev
Jean-Michel Trivi [Wed, 14 Oct 2015 01:32:38 +0000 (01:32 +0000)]
am
acb867f1: am
bf76eb7c: am
a2ed535c: NotificationPlayer supports MediaPlayer errors
* commit '
acb867f17c34828d14b3c71186253a269d85707c':
NotificationPlayer supports MediaPlayer errors
Jean-Michel Trivi [Wed, 14 Oct 2015 01:27:30 +0000 (01:27 +0000)]
am
bf76eb7c: am
a2ed535c: NotificationPlayer supports MediaPlayer errors
* commit '
bf76eb7cdaf1e2199217354bd6cbeaf37657486f':
NotificationPlayer supports MediaPlayer errors
Jean-Michel Trivi [Wed, 14 Oct 2015 01:22:32 +0000 (01:22 +0000)]
am
a2ed535c: NotificationPlayer supports MediaPlayer errors
* commit '
a2ed535c67a6c6fbe2ae4a086193ad68711e2129':
NotificationPlayer supports MediaPlayer errors
Adrian Roos [Tue, 13 Oct 2015 23:13:25 +0000 (23:13 +0000)]
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
Michael Lentine [Tue, 13 Oct 2015 23:09:19 +0000 (23:09 +0000)]
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.
Adrian Roos [Tue, 13 Oct 2015 23:08:26 +0000 (23:08 +0000)]
am
66536146: am
4673b259: Merge "Show charging speed in all locales" into mnc-dr-dev
* commit '
66536146bfeac90346b898f56c7e955ad83cd005':
Show charging speed in all locales
Adrian Roos [Tue, 13 Oct 2015 23:01:55 +0000 (23:01 +0000)]
am
4673b259: Merge "Show charging speed in all locales" into mnc-dr-dev
* commit '
4673b259bc1b362fee206c7476c5fde3f53b4e20':
Show charging speed in all locales
Michael Lentine [Tue, 13 Oct 2015 23:01:28 +0000 (23:01 +0000)]
am
202538ee: am
50e79632: Merge "Remove ColorFade resouces when screen off." into mnc-dr-dev
* commit '
202538eef0d9d9d40b650bdb1b449e1b404ed274':
Remove ColorFade resouces when screen off.
Jean-Michel Trivi [Fri, 21 Aug 2015 00:37:50 +0000 (17:37 -0700)]
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)
Michael Lentine [Tue, 13 Oct 2015 22:57:11 +0000 (22:57 +0000)]
am
50e79632: Merge "Remove ColorFade resouces when screen off." into mnc-dr-dev
* commit '
50e796326a39cd15af9031a41e3fe30b1f0f35f6':
Remove ColorFade resouces when screen off.
Adrian Roos [Tue, 13 Oct 2015 22:55:11 +0000 (22:55 +0000)]
Merge "Show charging speed in all locales" into mnc-dr-dev
Michael Lentine [Tue, 13 Oct 2015 22:51:12 +0000 (22:51 +0000)]
Merge "Remove ColorFade resouces when screen off." into mnc-dr-dev
Wei Jia [Tue, 13 Oct 2015 22:02:44 +0000 (22:02 +0000)]
am
559f28ec: am
d32df662: am
de612dc1: MediaPlayer: remove obsolete function setPlaybackRate from comments.
* commit '
559f28ec67636f7bed82550be7590db46b47f1d0':
MediaPlayer: remove obsolete function setPlaybackRate from comments.
Adrian Roos [Fri, 25 Sep 2015 22:15:17 +0000 (15:15 -0700)]
Show charging speed in all locales
Bug:
24167496
Change-Id: I3e883eeca002e86d4df30c2b238e18bd63bbddea
Wei Jia [Tue, 13 Oct 2015 21:52:33 +0000 (21:52 +0000)]
am
d32df662: am
de612dc1: MediaPlayer: remove obsolete function setPlaybackRate from comments.
* commit '
d32df6623e78efc173e5ff2534056543f963a58a':
MediaPlayer: remove obsolete function setPlaybackRate from comments.
Wei Jia [Tue, 13 Oct 2015 21:47:04 +0000 (21:47 +0000)]
am
de612dc1: MediaPlayer: remove obsolete function setPlaybackRate from comments.
* commit '
de612dc1d10d25e017ac911d0e7cca6709bdbb96':
MediaPlayer: remove obsolete function setPlaybackRate from comments.
Wei Liu [Tue, 13 Oct 2015 21:36:28 +0000 (21:36 +0000)]
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.
Michael Lentine [Fri, 25 Sep 2015 17:55:26 +0000 (10:55 -0700)]
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
Wei Jia [Wed, 7 Oct 2015 22:38:12 +0000 (15:38 -0700)]
MediaPlayer: remove obsolete function setPlaybackRate from comments.
Bug:
24260668
Change-Id: I20733e52dbd2dab5eb10b4607a1c1aadb93a1332
(cherry picked from commit
cd860ac06ca7a46e9638dd741ba731f066705eb5)
Wei Liu [Tue, 13 Oct 2015 21:30:46 +0000 (21:30 +0000)]
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.
Wei Liu [Tue, 13 Oct 2015 21:23:35 +0000 (21:23 +0000)]
Merge "Use wear style dialog for ICC hotswap restart dialog." into cw-e-dev
Jeff Hao [Tue, 13 Oct 2015 20:11:44 +0000 (20:11 +0000)]
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.
Jeff Hao [Tue, 13 Oct 2015 20:05:56 +0000 (20:05 +0000)]
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.
Jeff Hao [Tue, 13 Oct 2015 19:59:52 +0000 (19:59 +0000)]
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.
Jeff Hao [Tue, 13 Oct 2015 19:54:00 +0000 (19:54 +0000)]
Merge "Shorten first boot time by filtering dexopted apps by LRU." into mnc-dr-dev
Phil Burk [Tue, 13 Oct 2015 18:58:26 +0000 (18:58 +0000)]
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
Phil Burk [Tue, 13 Oct 2015 18:50:54 +0000 (18:50 +0000)]
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
Phil Burk [Tue, 13 Oct 2015 18:43:35 +0000 (18:43 +0000)]
am
8e82755d: Merge "BluetoothMidiDevice: change write type to support JamStik" into mnc-dr-dev
* commit '
8e82755dfdfee837cb73d3db3f6319301d2a5903':
BluetoothMidiDevice: change write type to support JamStik
Phil Burk [Tue, 13 Oct 2015 18:36:13 +0000 (18:36 +0000)]
Merge "BluetoothMidiDevice: change write type to support JamStik" into mnc-dr-dev
Phil Burk [Tue, 13 Oct 2015 18:21:44 +0000 (18:21 +0000)]
am
92ae0a54: am
7bbb6fed: am
977fe03b: BLE-MIDI: change binding for BluetoothMidiService
* commit '
92ae0a5480f8ac2107688bf2f6bb58d49cb52bd1':
BLE-MIDI: change binding for BluetoothMidiService
Phil Burk [Tue, 13 Oct 2015 18:15:51 +0000 (18:15 +0000)]
am
7bbb6fed: am
977fe03b: BLE-MIDI: change binding for BluetoothMidiService
* commit '
7bbb6fedbcce05cd712b464cecbdbd80e28a6b4e':
BLE-MIDI: change binding for BluetoothMidiService
Phil Burk [Tue, 13 Oct 2015 18:10:29 +0000 (18:10 +0000)]
am
977fe03b: BLE-MIDI: change binding for BluetoothMidiService
* commit '
977fe03b36a7783f9cee8497efe550a69b128473':
BLE-MIDI: change binding for BluetoothMidiService
Jeff Hao [Tue, 13 Oct 2015 17:00:10 +0000 (10:00 -0700)]
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
Wei Liu [Tue, 13 Oct 2015 17:20:13 +0000 (10:20 -0700)]
Use wear style dialog for ICC hotswap restart dialog.
b/
24719054
Change-Id: I0ce6b3064959dfd2dd1a4f89e76fcc87a0d4810c
Ronghua Wu [Tue, 13 Oct 2015 15:50:57 +0000 (15:50 +0000)]
am
c2fd35f7: am
57c332bd: am
c024de3c: media: ignore null InputStream
* commit '
c2fd35f7ae51d83b3d8f7f46c70e351bf0f18235':
media: ignore null InputStream
Ronghua Wu [Tue, 13 Oct 2015 15:46:00 +0000 (15:46 +0000)]
am
57c332bd: am
c024de3c: media: ignore null InputStream
* commit '
57c332bd4ad9a2120e5ca93ae5ce9175913aeedd':
media: ignore null InputStream
Ronghua Wu [Tue, 13 Oct 2015 15:40:48 +0000 (15:40 +0000)]
am
c024de3c: media: ignore null InputStream
* commit '
c024de3c946c18e8e4799eb8d372fdec3146f8cf':
media: ignore null InputStream
Phil Burk [Thu, 3 Sep 2015 21:37:03 +0000 (14:37 -0700)]
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)
Ronghua Wu [Tue, 11 Aug 2015 20:33:49 +0000 (13:33 -0700)]
media: ignore null InputStream
Bug:
22854896
Change-Id: I20b9e28bbba6dec73538ee6937d337c2e2b971f4
Lorenzo Colitti [Tue, 13 Oct 2015 06:21:21 +0000 (15:21 +0900)]
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
Eric Laurent [Tue, 13 Oct 2015 01:41:30 +0000 (01:41 +0000)]
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
Eric Laurent [Tue, 13 Oct 2015 01:22:44 +0000 (01:22 +0000)]
am
a14d1bd7: am
c1c462cb: Merge "MidiBluetoothService: add new device to HashMap" into mnc-dr-dev
* commit '
a14d1bd798ca38f24b2f489ad7f32dff700b141e':
MidiBluetoothService: add new device to HashMap
Yohei Yukawa [Tue, 13 Oct 2015 01:18:43 +0000 (01:18 +0000)]
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.
Eric Laurent [Tue, 13 Oct 2015 01:16:56 +0000 (01:16 +0000)]
am
c1c462cb: Merge "MidiBluetoothService: add new device to HashMap" into mnc-dr-dev
* commit '
c1c462cbaa8b65c6240f947de503619482296222':
MidiBluetoothService: add new device to HashMap
Yohei Yukawa [Tue, 13 Oct 2015 01:14:23 +0000 (01:14 +0000)]
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.
Eric Laurent [Tue, 13 Oct 2015 01:09:32 +0000 (01:09 +0000)]
Merge "MidiBluetoothService: add new device to HashMap" into mnc-dr-dev
Yohei Yukawa [Tue, 13 Oct 2015 01:07:20 +0000 (01:07 +0000)]
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.
Yohei Yukawa [Tue, 13 Oct 2015 01:00:30 +0000 (01:00 +0000)]
Merge "Unbind IME client when unsetting the current IME." into mnc-dr-dev
Svetoslav Ganov [Tue, 13 Oct 2015 00:20:58 +0000 (00:20 +0000)]
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
Adam Powell [Tue, 13 Oct 2015 00:20:51 +0000 (00:20 +0000)]
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
Dianne Hackborn [Tue, 13 Oct 2015 00:20:42 +0000 (00:20 +0000)]
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...
Adam Lesinski [Tue, 13 Oct 2015 00:20:24 +0000 (00:20 +0000)]
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
Phil Burk [Tue, 13 Oct 2015 00:20:17 +0000 (00:20 +0000)]
am
ff1e8f7e: am
1b3eb741: am
ca296978: Merge "MidiManager: fix double BTLE callback" into mnc-dr-dev
* commit '
ff1e8f7eeeb037a296d1fe49600927b5665fe8b7':
MidiManager: fix double BTLE callback
Phil Burk [Tue, 13 Oct 2015 00:20:06 +0000 (00:20 +0000)]
am
69ddaafa: am
0a64b146: am
e39def48: MidiService: update listener with current status when registered
* commit '
69ddaafac41a21b35b226ee22e189b9e7840e70f':
MidiService: update listener with current status when registered
Alan Viverette [Tue, 13 Oct 2015 00:19:30 +0000 (00:19 +0000)]
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
Yohei Yukawa [Tue, 13 Oct 2015 00:08:59 +0000 (17:08 -0700)]
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)
Winson [Mon, 12 Oct 2015 23:18:36 +0000 (16:18 -0700)]
Ensure we update the active pointer id on pointer up/down.
Bug:
24841350
Change-Id: Id5d91ee8adbb638caf66976d701cfbc0befaca04
Svetoslav Ganov [Mon, 12 Oct 2015 23:49:36 +0000 (23:49 +0000)]
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
Svetoslav Ganov [Mon, 12 Oct 2015 23:42:22 +0000 (23:42 +0000)]
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
Adam Powell [Mon, 12 Oct 2015 23:40:07 +0000 (23:40 +0000)]
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
Svetoslav Ganov [Mon, 12 Oct 2015 23:39:14 +0000 (23:39 +0000)]
Merge "Shared user retains permissions no longer used by any app on an app update" into mnc-dr-dev
Adam Powell [Mon, 12 Oct 2015 23:33:22 +0000 (23:33 +0000)]
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
OSDN Git Service
