OSDN Git Service
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
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: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: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: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: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
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
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:47:04 +0000 (21:47 +0000)]
am
de612dc1: MediaPlayer: remove obsolete function setPlaybackRate from comments.
* commit '
de612dc1d10d25e017ac911d0e7cca6709bdbb96':
MediaPlayer: remove obsolete function setPlaybackRate from comments.
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: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 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: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: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: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: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
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
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: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
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
Phil Burk [Tue, 22 Sep 2015 19:07:31 +0000 (12:07 -0700)]
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)
Adam Powell [Mon, 12 Oct 2015 23:28:36 +0000 (23:28 +0000)]
Merge "Add animation and positional stability to intent chooser UI" into mnc-dr-dev
Svetoslav [Mon, 12 Oct 2015 22:58:06 +0000 (15:58 -0700)]
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
Dianne Hackborn [Mon, 12 Oct 2015 23:00:20 +0000 (23:00 +0000)]
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...
Dianne Hackborn [Mon, 12 Oct 2015 22:55:10 +0000 (22:55 +0000)]
Merge ""Fix" issue #
24357296: Debug.getMemoryInfo doesn't include EGL mtrack..." into mnc-dr-dev
Adam Lesinski [Mon, 12 Oct 2015 22:16:00 +0000 (22:16 +0000)]
am
bde2707f: Merge "Add additional density enums to android:screenDensity attribute" into mnc-dr-dev
* commit '
bde2707f7cb8a5f97b3b077cd49bb034f1a359ff':
Add additional density enums to android:screenDensity attribute
Dianne Hackborn [Mon, 12 Oct 2015 22:14:16 +0000 (15:14 -0700)]
"Fix" issue #
24357296: Debug.getMemoryInfo doesn't include EGL mtrack...
...due to lack of permissions
Still doesn't, but an alternative is now offered.
Change-Id: I7b9da709c96ed7790c70d686c30c7855f3979778
Adam Lesinski [Mon, 12 Oct 2015 22:11:51 +0000 (22:11 +0000)]
Merge "Add additional density enums to android:screenDensity attribute" into mnc-dr-dev
Phil Burk [Mon, 12 Oct 2015 22:04:43 +0000 (22:04 +0000)]
am
ca296978: Merge "MidiManager: fix double BTLE callback" into mnc-dr-dev
* commit '
ca296978e7f2a1f70b8dca32b1db9372c2392458':
MidiManager: fix double BTLE callback
Phil Burk [Mon, 12 Oct 2015 22:01:03 +0000 (22:01 +0000)]
Merge "MidiManager: fix double BTLE callback" into mnc-dr-dev
Phil Burk [Mon, 12 Oct 2015 21:35:12 +0000 (21:35 +0000)]
am
e39def48: MidiService: update listener with current status when registered
* commit '
e39def480fd2d1bcc3a89751dd492d4634c38194':
MidiService: update listener with current status when registered
Phil Burk [Fri, 21 Aug 2015 22:39:10 +0000 (15:39 -0700)]
MidiBluetoothService: add new device to HashMap
The HashMap is being used but devices never added to the map.
Bug:
23429459
Change-Id: I1da5305a56f5bd48e1c5d9345e721ea8dd2eed4e
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit
e5f722e55c5708c2b48b8c9688c135e451225032)
Phil Burk [Fri, 21 Aug 2015 22:22:35 +0000 (15:22 -0700)]
MidiManager: fix double BTLE callback
Stop openBluetoothDevice() from calling its callback twice.
Bug:
23218338
Change-Id: I2e738b22a124c0336c46bef05680a82ee1f59e79
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit
0ca998d79fe95ded26ec4ff0a1e0a8dc4802684b)
Phil Burk [Thu, 6 Aug 2015 06:32:54 +0000 (23:32 -0700)]
MidiService: update listener with current status when registered
This will give an app an opportunity to learn whether an input port is busy
before the user tries to connect and then fails.
Bug:
22825043
Change-Id: Ifede60f166dfe66ea15453044fce06f4a8452b18
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit
b2355940e3e697deeecd1b6511cd5094f9dc553a)
Alan Viverette [Mon, 12 Oct 2015 19:46:31 +0000 (19:46 +0000)]
am
c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev
* commit '
c83a6121d214631c0a52be5b2c5c8ce2f6470ed0':
Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR
Alan Viverette [Mon, 12 Oct 2015 19:41:10 +0000 (19:41 +0000)]
Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev
Dianne Hackborn [Mon, 12 Oct 2015 19:16:02 +0000 (19:16 +0000)]
am
6cc3735a: Merge "Fix issue #
23581553: Ignore Battery Optimization not work for re-install app" into mnc-dr-dev
* commit '
6cc3735a492abd1c17f15a46287de70e62bf116d':
Fix issue #
23581553: Ignore Battery Optimization not work for re-install app
Dianne Hackborn [Mon, 12 Oct 2015 19:11:46 +0000 (19:11 +0000)]
Merge "Fix issue #
23581553: Ignore Battery Optimization not work for re-install app" into mnc-dr-dev
Adam Lesinski [Fri, 9 Oct 2015 20:14:07 +0000 (13:14 -0700)]
Add additional density enums to android:screenDensity attribute
Bug:
24804021
Change-Id: I70c34da9ca5d186aa1ffaacf7f15180d4c4b81e1
Wale Ogunwale [Mon, 12 Oct 2015 18:04:05 +0000 (18:04 +0000)]
am
5c18d051: Use effectiveUid instead of callingUid to set lockTaskMode
* commit '
5c18d0517749cf2e65d19ea6bec938a4eb6c39e5':
Use effectiveUid instead of callingUid to set lockTaskMode
Dianne Hackborn [Mon, 12 Oct 2015 17:59:47 +0000 (10:59 -0700)]
Fix issue #
23581553: Ignore Battery Optimization not work for re-install app
Remove from whitelist as appropriate. Also be sure we can find whitelisted
apps even if they are not installed in the primary user.
Change-Id: I3ed13dca99b3ba177af8f7bd26a75258df9b6949
Wale Ogunwale [Mon, 12 Oct 2015 17:34:14 +0000 (10:34 -0700)]
Use effectiveUid instead of callingUid to set lockTaskMode
The callingUid can be different from that of the app been locked
(e.g. was launched from launcher) there by leading to the app crashing
when it tries to exit lockTaskMode.
Bug:
24146132
Change-Id: I03346fabd1d7e61b29178220c72f747a0600f5ec
Miao Wang [Mon, 12 Oct 2015 16:52:34 +0000 (16:52 +0000)]
am
c4c42d55: Merge "[RenderScript] pass correct length of ains to BLAS functions" into mnc-dr-dev
* commit '
c4c42d55f0c1a4130da7e8f70a2338a4282b3ae5':
[RenderScript] pass correct length of ains to BLAS functions
Miao Wang [Mon, 12 Oct 2015 16:46:55 +0000 (16:46 +0000)]
Merge "[RenderScript] pass correct length of ains to BLAS functions" into mnc-dr-dev
Jeff Sharkey [Mon, 12 Oct 2015 16:39:38 +0000 (16:39 +0000)]
am
fe9c950a: Merge "Fix parole scheduling bugs." into mnc-dr-dev
* commit '
fe9c950a49a9bcdb9e35f709a7d1fffad58aa414':
Fix parole scheduling bugs.
Jeff Sharkey [Mon, 12 Oct 2015 16:39:34 +0000 (16:39 +0000)]
am
a03ecf7d: Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev
* commit '
a03ecf7d7c8ff2844caf5feecc6d29f1f7346ff9':
Push firewall rules up to ConnectivityService.
Jeff Sharkey [Mon, 12 Oct 2015 16:39:29 +0000 (16:39 +0000)]
am
fe45f1b9: Merge "Default location is "internalOnly" when undefined." into mnc-dr-dev
* commit '
fe45f1b97a1f572ce453193035f1fabf7957cc03':
Default location is "internalOnly" when undefined.
Jeff Sharkey [Mon, 12 Oct 2015 16:34:37 +0000 (16:34 +0000)]
Merge "Fix parole scheduling bugs." into mnc-dr-dev
Jeff Sharkey [Mon, 12 Oct 2015 16:34:19 +0000 (16:34 +0000)]
Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev
Jeff Sharkey [Mon, 12 Oct 2015 16:34:03 +0000 (16:34 +0000)]
Merge "Default location is "internalOnly" when undefined." into mnc-dr-dev
Vinu Deokaran [Mon, 12 Oct 2015 16:09:46 +0000 (16:09 +0000)]
am
6be61a98: wm: call displayReady for all built in displays when system is ready.
* commit '
6be61a98fccbadfdcfcefe9aa51d90bfb6c13901':
wm: call displayReady for all built in displays when system is ready.
Vinu Deokaran [Tue, 16 Dec 2014 15:52:52 +0000 (10:52 -0500)]
wm: call displayReady for all built in displays when system is ready.
When system has more than one built in display, displayReady needs
to be called for all built in displays when window manager is ready.
Otherwise, some system services, such as presentation, mediarouter,
etc, won't work on these displays.
Bug:
24103683
Change-Id: Ibf08074eff555c14a318236bd06e7b4855503140
Geoff Mendal [Mon, 12 Oct 2015 14:20:03 +0000 (14:20 +0000)]
am
ac3b53a7: (-s ours) Import translations. DO NOT MERGE
* commit '
ac3b53a734df0ec994d6068b7c0331da1fa0aa80':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 14:03:29 +0000 (07:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I24c1dbc83857fa0af6a57d0a834fcda1394fd313
Auto-generated-cl: translation import
Lorenzo Colitti [Sun, 11 Oct 2015 13:43:34 +0000 (13:43 +0000)]
am
4e4d59ee: Connect the DHCP UDP socket to the server.
* commit '
4e4d59eeef86fa8560d35c00168869b0a066f962':
Connect the DHCP UDP socket to the server.
Lorenzo Colitti [Sun, 11 Oct 2015 13:43:24 +0000 (13:43 +0000)]
am
eb0bbd45: Merge changes Id6a0b0de,I5f03b8b2,I62464b92 into mnc-dr-dev
* commit '
eb0bbd45f62fcaff26151b54a7b3ea16bb67e3be':
Support DHCP replies with multiple default gateways.
Accept DHCP responses from non-67 server source ports
Improve logging of DHCP parse errors using exceptions.
Lorenzo Colitti [Thu, 10 Sep 2015 09:12:18 +0000 (18:12 +0900)]
Connect the DHCP UDP socket to the server.
This makes it so that the socket cannot receive datagrams from
anybody except the DHCP server. This does not improve security,
because we never read from the UDP socket anyway, but it does
make ListeningPortsTest pass.
Bug:
23906864
Bug:
23933386
Change-Id: Ib090273a417f7eb2ac1ee3309260249b72fb8345
Lorenzo Colitti [Sun, 11 Oct 2015 06:48:33 +0000 (06:48 +0000)]
Merge changes Id6a0b0de,I5f03b8b2,I62464b92 into mnc-dr-dev
* changes:
Support DHCP replies with multiple default gateways.
Accept DHCP responses from non-67 server source ports
Improve logging of DHCP parse errors using exceptions.
Dianne Hackborn [Sat, 10 Oct 2015 00:48:41 +0000 (00:48 +0000)]
am
09e405d6: Merge "Fix issue #
24743380: VoiceInteractionManagerService doesn\'t use current..." into mnc-dr-dev
* commit '
09e405d660c0fe696402d10732084888192ca446':
Fix issue #
24743380: VoiceInteractionManagerService doesn't use current...
Dianne Hackborn [Sat, 10 Oct 2015 00:42:02 +0000 (00:42 +0000)]
Merge "Fix issue #
24743380: VoiceInteractionManagerService doesn't use current..." into mnc-dr-dev
Dianne Hackborn [Fri, 9 Oct 2015 23:09:25 +0000 (16:09 -0700)]
Fix issue #
24743380: VoiceInteractionManagerService doesn't use current...
...user for service info
Now it does.
The actual change is basically one line, passing in the current user
when building the service info. The rest is more debugging output to
be able to see what is going on.
Change-Id: I451884e0780aac6ee92fd2cd520071894afdf586
Miao Wang [Wed, 30 Sep 2015 22:38:07 +0000 (15:38 -0700)]
[RenderScript] pass correct length of ains to BLAS functions
bug:
24540091
Change-Id: Ia541bcbee07125c4caf3e0f4863702a3c0b929d5
(cherry picked from commit
0b34f2a3c545cb112a23072c92214e359a8df8c6)
Jeff Sharkey [Fri, 9 Oct 2015 20:22:09 +0000 (13:22 -0700)]
Default location is "internalOnly" when undefined.
When an app doesn't define installLocation, the default behavior
should be to treat it as internal only. This matches all the
published developer documentation.
Without this, apps could be unwittingly be moved to adopted storage
devices.
Bug:
24771264
Change-Id: Iaf38ab45329aad6cb5d6deac81fb1781f680189b
Anthony Hugh [Fri, 9 Oct 2015 18:26:56 +0000 (18:26 +0000)]
Merge "Give Android Wear system apps default permission" into cw-e-dev
Pirama Arumuga Nainar [Fri, 9 Oct 2015 17:35:23 +0000 (17:35 +0000)]
am
1078942e: Safely handle interrupts during Thread.join()
* commit '
1078942ed8b4029665e950ae576baa024f69e782':
Safely handle interrupts during Thread.join()
Pirama Arumuga Nainar [Fri, 9 Oct 2015 17:29:03 +0000 (10:29 -0700)]
resolved conflicts for
93db3d4b to cw-e-dev
Change-Id: I264c09c2cc7e9f0e3b1a83a52c965238aab55aae
Pirama Arumuga Nainar [Fri, 2 Oct 2015 23:38:08 +0000 (16:38 -0700)]
Safely handle interrupts during Thread.join()
Bug:
24342101
Interrupt current thread if InterruptedException is received during
Thread.join(). Also, log the interruption.
Change-Id: I452124915ea3f19610e6d4a3411d741f2f604af2
(cherry picked from commit
83461d73bc50d41f631e1db5c195d12b4eb9e6cf)
Pirama Arumuga Nainar [Fri, 2 Oct 2015 19:06:10 +0000 (12:06 -0700)]
Retry if interrupted before mMessageThread has joined
Bug:
24342101
If interrupted during mMessageThread.join(), retry the join instead of
assuming the thread has joined and continuing. Continuing to destroy
the context will cause a segfault when the message thread attempts to
use the destroyed context.
Change-Id: I3213091a0e996449bceb403dffca3063786d5a65
(cherry picked from commit
2f25ce7753f7f1f6a0cc549a0df0082286bd5f85)
Anthony Hugh [Tue, 29 Sep 2015 23:50:35 +0000 (16:50 -0700)]
Give Android Wear system apps default permission
This change grants Android Wear system components default
permission.
I have also added a new Intent category to help identify
the main Home handler on Wear.
BUG:
23419042
Change-Id: Ie669a9908bd3b03498f75c5ca22c0fddf52a5203
Jason Monk [Thu, 8 Oct 2015 20:28:10 +0000 (20:28 +0000)]
am
29433f70: Merge "Actually apply after no sims change." into mnc-dr-dev
* commit '
29433f701f6722e1f175dd3b735ed025309907b0':
Actually apply after no sims change.
Jason Monk [Thu, 8 Oct 2015 20:21:00 +0000 (20:21 +0000)]
Merge "Actually apply after no sims change." into mnc-dr-dev
Jeff Sharkey [Thu, 8 Oct 2015 17:02:38 +0000 (17:02 +0000)]
am
d473a144: Merge "Hold wake-lock during copy operations." into mnc-dr-dev
* commit '
d473a1446e520616c4079594bbcf3c6fbe88ed4f':
Hold wake-lock during copy operations.
Jeff Sharkey [Thu, 8 Oct 2015 16:58:54 +0000 (16:58 +0000)]
Merge "Hold wake-lock during copy operations." into mnc-dr-dev
Jason Monk [Thu, 8 Oct 2015 14:09:21 +0000 (10:09 -0400)]
Actually apply after no sims change.
Bug:
24244260
Change-Id: I922d45e6dcc4eb85fc7d93824e7d01645a90266e
Puneet Kumar [Thu, 8 Oct 2015 09:08:30 +0000 (09:08 +0000)]
am
0a1f0e56: Merge "Add ESC mapping for Pixel C keyboard" into mnc-dr-dev
* commit '
0a1f0e56b4ea8c78a1fac3218cfa4efa4cbe3117':
Add ESC mapping for Pixel C keyboard
Puneet Kumar [Thu, 8 Oct 2015 09:08:26 +0000 (09:08 +0000)]
am
06d1254c: Merge "Add layout and keymap for Pixel C Bluetooth keyboard" into mnc-dr-dev
* commit '
06d1254c9b63f0f3304ef4dd1de8602655ef9a3f':
Add layout and keymap for Pixel C Bluetooth keyboard
Puneet Kumar [Thu, 8 Oct 2015 08:17:38 +0000 (08:17 +0000)]
Merge "Add ESC mapping for Pixel C keyboard" into mnc-dr-dev
Puneet Kumar [Thu, 8 Oct 2015 08:17:23 +0000 (08:17 +0000)]
Merge "Add layout and keymap for Pixel C Bluetooth keyboard" into mnc-dr-dev
Lorenzo Colitti [Wed, 16 Sep 2015 22:55:29 +0000 (07:55 +0900)]
Support DHCP replies with multiple default gateways.
Just use the first one for compatibility with the legacy client.
Bug:
23975855
Change-Id: Id6a0b0de32e8947c12c02eb9a3be417e2f82c99a
Erik Kline [Tue, 6 Oct 2015 09:43:17 +0000 (18:43 +0900)]
Accept DHCP responses from non-67 server source ports
Bug:
24687559
Change-Id: I5f03b8b2780c558281d8a50d0893fd64f2812add
Erik Kline [Wed, 16 Sep 2015 06:44:54 +0000 (15:44 +0900)]
Improve logging of DHCP parse errors using exceptions.
Bug:
23975855
Change-Id: I62464b92f0bb568e57bf5e1a63bc75f22c75aac1