201785 Commits

Author SHA1 Message Date
Roozbeh Pournader
bdf952aab7 Merge "Make Hyphenator#get() return an object." into mnc-dr-dev 2015-10-14 21:07:13 +00:00
Winson Chung
d8fed39f3c 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.
2015-10-14 20:45:35 +00:00
Winson Chung
c7a873e356 Merge "Ensure we update the active pointer id on pointer up/down." into mnc-dr-dev 2015-10-14 20:42:21 +00:00
Julia Reynolds
97eff878a4 Selectively show zen footer.
Only show zen footer if the active stream is affected by the current
zen mode.

Bug: 23844466
Change-Id: I08770882f12f11c3458e1e48a287139480ae7aa3
(cherry picked from commit 6aa83b4ca0859c3f59413ef092f8d843f8646f0e)
2015-10-14 20:22:56 +00:00
Julia Reynolds
3a10b10ee5 Update volume slider on device changed.
Bug: 24501085
Change-Id: I5bd0ac014eb291cafcf918e8a73a30e95245d533
2015-10-14 16:13:28 -04:00
Adam Powell
4eb9871ead 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
2015-10-14 13:10:18 -07:00
Raph Levien
35e026929b Load binary hyphen data files
Support for loading the pre-compiled binary format for hyphenation
patterns.

Bug: 21562869
Bug: 21826930
Bug: 24570591
Change-Id: Iaeaa9c9ac9dac236af6b0d7894c2e2396bc8447d
(cherry picked from commit 091dba2de1e5fa7d4db9f8ccbf1f86e5825d0f52)
2015-10-14 19:11:33 +00:00
Roozbeh Pournader
0453112de6 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)
2015-10-14 19:10:44 +00:00
Sungmin Choi
b053b3cc60 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>
2015-10-14 11:13:50 -07:00
Erik Kline
f23eece200 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.
2015-10-14 17:42:14 +00:00
Erik Kline
b7e722b88f Merge "Don't crash if an invalid always-on VPN profile is configured." into mnc-dr-dev 2015-10-14 17:37:57 +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
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
bf76eb7cda am a2ed535c: NotificationPlayer supports MediaPlayer errors
* commit 'a2ed535c67a6c6fbe2ae4a086193ad68711e2129':
  NotificationPlayer supports MediaPlayer errors
2015-10-14 01:22:32 +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
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
Adrian Roos
f142cac734 Show charging speed in all locales
Bug: 24167496
Change-Id: I3e883eeca002e86d4df30c2b238e18bd63bbddea
2015-10-13 21:54:36 +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
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
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
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
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
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
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
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
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
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
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
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
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
Dianne Hackborn
829920ede0 am 34c120dc: Merge ""Fix" issue #24357296: Debug.getMemoryInfo doesn\'t include EGL mtrack..." into mnc-dr-dev
* commit '34c120dc6142c861cb131c900cdee3c19f81ce51':
  "Fix" issue #24357296: Debug.getMemoryInfo doesn't include EGL mtrack...
2015-10-12 23:00:20 +00:00