200209 Commits

Author SHA1 Message Date
Dianne Hackborn
34c120dc61 Merge ""Fix" issue #24357296: Debug.getMemoryInfo doesn't include EGL mtrack..." into mnc-dr-dev 2015-10-12 22:55:10 +00:00
Dianne Hackborn
b02ce29144 "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
2015-10-12 15:14:16 -07:00
Adam Lesinski
bde2707f7c Merge "Add additional density enums to android:screenDensity attribute" into mnc-dr-dev 2015-10-12 22:11:51 +00:00
Phil Burk
ca296978e7 Merge "MidiManager: fix double BTLE callback" into mnc-dr-dev 2015-10-12 22:01:03 +00:00
Phil Burk
afa038c074 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)
2015-10-12 21:01:35 +00:00
Phil Burk
e39def480f 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)
2015-10-12 20:59:57 +00:00
Alan Viverette
c83a6121d2 Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev 2015-10-12 19:41:10 +00:00
Dianne Hackborn
6cc3735a49 Merge "Fix issue #23581553: Ignore Battery Optimization not work for re-install app" into mnc-dr-dev 2015-10-12 19:11:46 +00:00
Adam Lesinski
06c07a1207 Add additional density enums to android:screenDensity attribute
Bug:24804021
Change-Id: I70c34da9ca5d186aa1ffaacf7f15180d4c4b81e1
2015-10-12 18:25:42 +00:00
Dianne Hackborn
1b79ad74ef 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
2015-10-12 10:59:47 -07:00
Wale Ogunwale
5c18d05177 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
2015-10-12 17:40:56 +00:00
Miao Wang
c4c42d55f0 Merge "[RenderScript] pass correct length of ains to BLAS functions" into mnc-dr-dev 2015-10-12 16:46:55 +00:00
Jeff Sharkey
fe9c950a49 Merge "Fix parole scheduling bugs." into mnc-dr-dev 2015-10-12 16:34:37 +00:00
Jeff Sharkey
a03ecf7d7c Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev 2015-10-12 16:34:19 +00:00
Jeff Sharkey
fe45f1b97a Merge "Default location is "internalOnly" when undefined." into mnc-dr-dev 2015-10-12 16:34:03 +00:00
Vinu Deokaran
6be61a98fc 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
2015-10-12 16:00:54 +00:00
Geoff Mendal
ac3b53a734 Import translations. DO NOT MERGE
Change-Id: I24c1dbc83857fa0af6a57d0a834fcda1394fd313
Auto-generated-cl: translation import
2015-10-12 07:03:29 -07:00
Lorenzo Colitti
4e4d59eeef 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
2015-10-11 16:06:11 +09:00
Lorenzo Colitti
eb0bbd45f6 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.
2015-10-11 06:48:33 +00:00
Dianne Hackborn
09e405d660 Merge "Fix issue #24743380: VoiceInteractionManagerService doesn't use current..." into mnc-dr-dev 2015-10-10 00:42:02 +00:00
Dianne Hackborn
958b9d2ecc 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
2015-10-09 16:09:25 -07:00
Miao Wang
d22b9b7757 [RenderScript] pass correct length of ains to BLAS functions
bug: 24540091
Change-Id: Ia541bcbee07125c4caf3e0f4863702a3c0b929d5
(cherry picked from commit 0b34f2a3c545cb112a23072c92214e359a8df8c6)
2015-10-09 14:06:55 -07:00
Jeff Sharkey
c88a2d5b33 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
2015-10-09 13:22:09 -07:00
Pirama Arumuga Nainar
1078942ed8 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)
2015-10-08 20:14:51 -07:00
Pirama Arumuga Nainar
93db3d4bfd 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)
2015-10-08 20:13:50 -07:00
Jason Monk
29433f701f Merge "Actually apply after no sims change." into mnc-dr-dev 2015-10-08 20:21:00 +00:00
Jeff Sharkey
d473a1446e Merge "Hold wake-lock during copy operations." into mnc-dr-dev 2015-10-08 16:58:54 +00:00
Jason Monk
64f4f9887a Actually apply after no sims change.
Bug: 24244260
Change-Id: I922d45e6dcc4eb85fc7d93824e7d01645a90266e
2015-10-08 10:09:21 -04:00
Puneet Kumar
0a1f0e56b4 Merge "Add ESC mapping for Pixel C keyboard" into mnc-dr-dev 2015-10-08 08:17:38 +00:00
Puneet Kumar
06d1254c9b Merge "Add layout and keymap for Pixel C Bluetooth keyboard" into mnc-dr-dev 2015-10-08 08:17:23 +00:00
Lorenzo Colitti
025f4a5aae Support DHCP replies with multiple default gateways.
Just use the first one for compatibility with the legacy client.

Bug: 23975855
Change-Id: Id6a0b0de32e8947c12c02eb9a3be417e2f82c99a
2015-10-08 16:28:02 +09:00
Erik Kline
b19238c488 Accept DHCP responses from non-67 server source ports
Bug: 24687559
Change-Id: I5f03b8b2780c558281d8a50d0893fd64f2812add
2015-10-08 15:40:41 +09:00
Erik Kline
496906ee70 Improve logging of DHCP parse errors using exceptions.
Bug: 23975855
Change-Id: I62464b92f0bb568e57bf5e1a63bc75f22c75aac1
2015-10-08 15:40:31 +09:00
Tim Murray
0135690688 Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev 2015-10-07 23:21:14 +00:00
Chien-Yu Chen
ab7812750b Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev 2015-10-07 23:03:52 +00:00
Chien-Yu Chen
d890f4f400 MediaActionSound: Fix video stop sound
Bug: 24745252
Change-Id: I803679d52750e09c7fc7b881523becf9259b558b
2015-10-07 15:17:19 -07:00
Yin-Chia Yeh
9d68833686 am a636be6c: Camera: fix wrong FULL feature string
* commit 'a636be6c9a8a9192f72a111c2b3084a226d37b7e':
  Camera: fix wrong FULL feature string
2015-10-07 21:36:35 +00:00
Robert Carr
57caeb5703 Ensure SurfaceView requests WM relayout when size changes.
In the case of scaled SurfaceViews with a fixed size.
It is possible for the surface layout size to change
without a change to the surface size or position. In this
case we need to inform the window manager so it can update
frames and scaling. This has presented in Camera and required
workarounds such as changing the fixed surface size to trigger
an update (leading to visual artifacts).

Bug:23974105
Change-Id: I195aa0832907c32874b294101b56e198e853dce5
(cherry picked from commit a8fe43f09c0ed2119e55139a482f7f12fbe7d725)
2015-10-07 20:39:11 +00:00
Eric Laurent
2a6f1d4af3 Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev 2015-10-07 13:39:51 +00:00
Yin-Chia Yeh
a636be6c9a Camera: fix wrong FULL feature string
Bug: 24678065
Change-Id: I2ca49565b919c87005d941863e22e3852a01a6c6
2015-10-06 13:45:20 -07:00
Selim Cinek
714a61cd58 Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev 2015-10-06 01:59:50 +00:00
Adam Lesinski
8461f2fa02 am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev
* commit '46684d2caeef93f43be260d996e925ea6e4147ea':
  Add anydpi to the providing-resources docs
2015-10-06 00:51:13 +00:00
Adam Lesinski
46684d2cae Merge "Add anydpi to the providing-resources docs" into mnc-dev 2015-10-05 22:31:22 +00:00
Jean-Michel Trivi
0155856a1d Fix AudioService rotation helper thread
Fix a race condition where the wait index can be incremented inbetween
  the while() loop and the lock
Fix when updateOrientation() is called: after the sleep, otherwise
  the last sleep is useless.

Bug 24677424

Change-Id: I03770a0fc8af57f4696ebee7e9c9110e17c55a24
2015-10-05 15:26:21 -07:00
Adam Lesinski
4cad00b696 Add anydpi to the providing-resources docs
Change-Id: Ic108d9da2e39b9f8581311fe610a1959a24a732f
2015-10-05 19:39:40 +00:00
Eric Laurent
e0ced4da19 ZenModeHelper: fix cross deadlock with AudioService
Processing ZenModeHelper.setConfig() synchronously in
ZenModeConditions.onConditionChanged() can cause a cross deadlock between
ConditionProviders.mMutex and AudioService.mSettingsLock.

Add a method to set Zen mode config asynchronously.

Bug: 24528290.
Change-Id: I9c1701ca6bef084527821175d84002b612241995
2015-10-05 10:43:52 -07:00
Alan Viverette
3b49317977 Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR
Bug: 24657825
Change-Id: Ifa61fe934b3e2467e86c71b37b4f3ede40989e96
2015-10-05 11:13:02 -04:00
Geoff Mendal
faebbe82fa Import translations. DO NOT MERGE
Change-Id: I21cc5a0ce2710498f3aa76c904e653b90a14ecda
Auto-generated-cl: translation import
2015-10-05 06:58:33 -07:00
Tim Murray
791763796e Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev 2015-10-02 20:43:30 +00:00
Jorim Jaggi
8c66fa9436 Merge "Add minimum time for double tap gesture" into mnc-dr-dev 2015-10-02 19:55:26 +00:00