OSDN Git Service
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
Tim Murray [Wed, 7 Oct 2015 23:28:13 +0000 (23:28 +0000)]
am
01356906: Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev
* commit '
0135690688c8285e022a2a8191c8582f2e6ea759':
Ensure SurfaceView requests WM relayout when size changes.
Tim Murray [Wed, 7 Oct 2015 23:21:14 +0000 (23:21 +0000)]
Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev
Chien-Yu Chen [Wed, 7 Oct 2015 23:11:20 +0000 (23:11 +0000)]
am
ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev
* commit '
ab7812750bca947abc9e8b1ce73a3041dbc2f2a9':
MediaActionSound: Fix video stop sound
Chien-Yu Chen [Wed, 7 Oct 2015 23:03:52 +0000 (23:03 +0000)]
Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev
Chien-Yu Chen [Wed, 7 Oct 2015 22:17:19 +0000 (15:17 -0700)]
MediaActionSound: Fix video stop sound
Bug:
24745252
Change-Id: I803679d52750e09c7fc7b881523becf9259b558b
Yin-Chia Yeh [Wed, 7 Oct 2015 21:41:38 +0000 (21:41 +0000)]
am
9d688336: am
a636be6c: Camera: fix wrong FULL feature string
* commit '
9d68833686e04ff5ff910a9d90fe99bc1347aaca':
Camera: fix wrong FULL feature string
Yin-Chia Yeh [Wed, 7 Oct 2015 21:36:35 +0000 (21:36 +0000)]
am
a636be6c: Camera: fix wrong FULL feature string
* commit '
a636be6c9a8a9192f72a111c2b3084a226d37b7e':
Camera: fix wrong FULL feature string
Robert Carr [Wed, 7 Oct 2015 18:24:31 +0000 (11:24 -0700)]
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)
Eric Laurent [Wed, 7 Oct 2015 13:46:48 +0000 (13:46 +0000)]
am
2a6f1d4a: Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev
* commit '
2a6f1d4af39a72abecf16cc0a95feda7431afc07':
ZenModeHelper: fix cross deadlock with AudioService
Eric Laurent [Wed, 7 Oct 2015 13:39:51 +0000 (13:39 +0000)]
Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev
Yin-Chia Yeh [Tue, 6 Oct 2015 20:45:20 +0000 (13:45 -0700)]
Camera: fix wrong FULL feature string
Bug:
24678065
Change-Id: I2ca49565b919c87005d941863e22e3852a01a6c6
Selim Cinek [Tue, 6 Oct 2015 02:06:20 +0000 (02:06 +0000)]
am
714a61cd: Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev
* commit '
714a61cd586c789b18acfd0567cfea2b4ea170dd':
Ambient display now comes up immediately when a notification comes in
Selim Cinek [Tue, 6 Oct 2015 01:59:50 +0000 (01:59 +0000)]
Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev
Adam Lesinski [Tue, 6 Oct 2015 00:57:43 +0000 (00:57 +0000)]
am
8461f2fa: am
46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev
* commit '
8461f2fa02c4c2ca2eef5bae391f1d1ff2c28593':
Add anydpi to the providing-resources docs
Adam Lesinski [Tue, 6 Oct 2015 00:51:13 +0000 (00:51 +0000)]
am
46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev
* commit '
46684d2caeef93f43be260d996e925ea6e4147ea':
Add anydpi to the providing-resources docs
Jean-Michel Trivi [Tue, 6 Oct 2015 00:14:01 +0000 (00:14 +0000)]
am
0155856a: Fix AudioService rotation helper thread
* commit '
0155856a1d1cb272d83b6175953dd7151fe65daa':
Fix AudioService rotation helper thread
Pirama Arumuga Nainar [Fri, 2 Oct 2015 23:38:08 +0000 (16:38 -0700)]
Safely handle interrupts during Thread.join()
Interrupt current thread if InterruptedException is received during
Thread.join(). Also, log the interruption.
Change-Id: I452124915ea3f19610e6d4a3411d741f2f604af2
(cherry picked from commit
83461d73bc50d41f631e1db5c195d12b4eb9e6cf)
Adam Lesinski [Mon, 5 Oct 2015 22:31:22 +0000 (22:31 +0000)]
Merge "Add anydpi to the providing-resources docs" into mnc-dev
Jean-Michel Trivi [Mon, 5 Oct 2015 22:26:21 +0000 (15:26 -0700)]
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
Adam Lesinski [Tue, 8 Sep 2015 21:16:49 +0000 (14:16 -0700)]
Add anydpi to the providing-resources docs
Change-Id: Ic108d9da2e39b9f8581311fe610a1959a24a732f
Nick Armstrong-Crews [Mon, 5 Oct 2015 18:23:12 +0000 (18:23 +0000)]
Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev
Nick Armstrong-Crews [Wed, 30 Sep 2015 23:49:19 +0000 (16:49 -0700)]
Fix the logging of wake time saved by Ungaze.
The logging of saved time was erroneously being called more than once
per wake period. Moved the logging logic to be called from
finishWakefulnessChange(), which is only called once per wake period.
Change-Id: I268ef44edce5807644fcc8fb0dcaa1a96cae6c9e
Eric Laurent [Thu, 1 Oct 2015 00:44:28 +0000 (17:44 -0700)]
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
Geoff Mendal [Mon, 5 Oct 2015 14:05:00 +0000 (14:05 +0000)]
am
faebbe82: (-s ours) Import translations. DO NOT MERGE
* commit '
faebbe82fa72036db75d679d366681822d2d551c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 13:58:33 +0000 (06:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I21cc5a0ce2710498f3aa76c904e653b90a14ecda
Auto-generated-cl: translation import
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)
Tim Murray [Fri, 2 Oct 2015 20:48:04 +0000 (20:48 +0000)]
am
79176379: Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev
* commit '
791763796e5f21e34c3ae81c1faad2a4c1a515dd':
Send POWER_HINT_INTERACTION on rotate.
Tim Murray [Fri, 2 Oct 2015 20:43:30 +0000 (20:43 +0000)]
Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev
Jorim Jaggi [Fri, 2 Oct 2015 20:00:34 +0000 (20:00 +0000)]
am
8c66fa94: Merge "Add minimum time for double tap gesture" into mnc-dr-dev
* commit '
8c66fa94361b51f39f87530f6d1f714120437cc6':
Add minimum time for double tap gesture
Jorim Jaggi [Fri, 2 Oct 2015 19:55:26 +0000 (19:55 +0000)]
Merge "Add minimum time for double tap gesture" into mnc-dr-dev
Jeff Sharkey [Thu, 1 Oct 2015 22:14:57 +0000 (15:14 -0700)]
Hold wake-lock during copy operations.
If the CPU goes to sleep during the copy, certain devices will
collapse the USB OTG power domain, which can cause user data loss.
Bug:
24574575
Change-Id: I8e26caac8784490d2dee324b38e6085cd55eb8bb
Jean-Michel Trivi [Fri, 2 Oct 2015 02:52:40 +0000 (02:52 +0000)]
am
24806db8: AudioService: alternative way of handling device rotation
* commit '
24806db8f6f523542510097ce0af4a32beeda83b':
AudioService: alternative way of handling device rotation
Jianing Wei [Fri, 2 Oct 2015 02:11:55 +0000 (02:11 +0000)]
am
6ffe9f05: am
2813b0fa: Camera2: Update video stabilization API doc.
* commit '
6ffe9f05de81fab8e3cb4031a784e26c2c0acce1':
Camera2: Update video stabilization API doc.
Jean-Michel Trivi [Thu, 1 Oct 2015 22:00:59 +0000 (15:00 -0700)]
AudioService: alternative way of handling device rotation
For devices that monitor orientation (primarily for channel assignment
to stereo speakers):
The com.android.server.policy.WindowOrientationListener API is more
power efficient than simply monitoring the device's orientation. When
supported, use it instead of android.view.OrientationEventListener.
When WindowOrientationListener reports an orientation change, start
a thread to poll the UI orientation, as its change may lag behind
the observed rotation. Gradually increasing delays between polls
are stored in a table.
Bug
24415763
Change-Id: I69bf68da6107af24cd02a48961dd17ceab557816
Tim Murray [Fri, 2 Oct 2015 00:07:12 +0000 (17:07 -0700)]
Send POWER_HINT_INTERACTION on rotate.
Send a POWER_HINT_INTERACTION to improve redraw performance when the
phone is rotated.
bug
24583227
Change-Id: I1978f0dfb9a25c00ad4da5b44d10410ad7412001
Jorim Jaggi [Thu, 1 Oct 2015 21:13:04 +0000 (14:13 -0700)]
Add minimum time for double tap gesture
Bug:
24304031
Change-Id: I15629d6b05175aea9b0d02571f6245966094f162
Jianing Wei [Thu, 1 Oct 2015 16:40:21 +0000 (16:40 +0000)]
am
2813b0fa: Camera2: Update video stabilization API doc.
* commit '
2813b0fae99fed1096dc23c3899e223459a54cec':
Camera2: Update video stabilization API doc.
Jeff Sharkey [Wed, 30 Sep 2015 20:11:22 +0000 (20:11 +0000)]
am
30fd0628: Merge "Relax auto-launch checks for GET_CONTENT." into mnc-dr-dev
* commit '
30fd0628970b418dea382b388120f52504ff2243':
Relax auto-launch checks for GET_CONTENT.
Jeff Sharkey [Wed, 30 Sep 2015 20:11:17 +0000 (20:11 +0000)]
am
e69ff2a8: Merge "Clean stale entries when deleting files." into mnc-dr-dev
* commit '
e69ff2a878ee7635a467259995e2924fb96a3a72':
Clean stale entries when deleting files.
Geoff Mendal [Wed, 30 Sep 2015 20:11:13 +0000 (20:11 +0000)]
am
a6bf0ebd: (-s ours) Import translations. DO NOT MERGE
* commit '
a6bf0ebd6e7decda9ee02811cc5b73b96b9b9de5':
Import translations. DO NOT MERGE
Jeff Sharkey [Wed, 30 Sep 2015 16:22:17 +0000 (16:22 +0000)]
Merge "Relax auto-launch checks for GET_CONTENT." into mnc-dr-dev
Jeff Sharkey [Wed, 30 Sep 2015 16:20:40 +0000 (16:20 +0000)]
Merge "Clean stale entries when deleting files." into mnc-dr-dev
Geoff Mendal [Wed, 30 Sep 2015 14:01:01 +0000 (07:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I22e6ce4ec3dd122bef49b23a26c9bc2d76980068
Auto-generated-cl: translation import
Adam Lesinski [Tue, 29 Sep 2015 23:30:27 +0000 (23:30 +0000)]
am
ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev
* commit '
ffc6ce000568c08a50f7b538bd4cd7729e64c229':
Fix asymmetry in parceling/unparceling code for BatteryStats summary
Adam Lesinski [Tue, 29 Sep 2015 23:22:59 +0000 (23:22 +0000)]
Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev
Jianing Wei [Tue, 29 Sep 2015 21:24:36 +0000 (14:24 -0700)]
Camera2: Update video stabilization API doc.
Bug:
23353979
Change-Id: I781006d1b6ebbdf522ebbf6acc35b2062aff76b6
Dmitry Torokhov [Wed, 23 Sep 2015 01:07:20 +0000 (18:07 -0700)]
Add ESC mapping for Pixel C keyboard
Now that we have "replace" key event support in the framework we can map
ESC as AltR+1.
Bug:
24504154
Change-Id: Ief8a50098fc5484171011f268ffc22a309cbba62
Dmitry Torokhov [Tue, 22 Sep 2015 22:51:22 +0000 (15:51 -0700)]
Add layout and keymap for Pixel C Bluetooth keyboard
This adds special layout and character map for Pixel C keyboard (Dragon
base) that lacks several keys, such as ESC, bracket keys, tilda and
backslash, which are mapped various Alt-R combinations.
Currently we map:
[Shift]+AltR+2 -> ~ and `
[Shift]+AltR+O -> { and [
[Shift]+AltR+P -> } and ]
[Shift]+AltR+= -> | and \
ESC mapping requires additional changes.
Bug:
24504154
Change-Id: I24fc68efe7e2ddebee26a273838443b441491857
Jeff Sharkey [Tue, 29 Sep 2015 20:04:46 +0000 (13:04 -0700)]
Relax auto-launch checks for GET_CONTENT.
When a developer wraps an intent with Intent.createChooser(), they're
indicating that the user should always be prompted, instead of using
any "always use" defaults. A recent CL changed the chooser behavior
to ensure that UI is always shown in the case where there is only one
match.
However, this caused us to start prompting for the GET_CONTENT intent,
for which there is only ever one DocumentsUI system app. Since that
app delivers on the createChooser() contract described above, we're
okay automatically launching it.
Bug:
24464358
Change-Id: I0279d3343479c134a35f41ddf3cb4204d0ae6a90
Selim Cinek [Thu, 24 Sep 2015 11:19:25 +0000 (13:19 +0200)]
Ambient display now comes up immediately when a notification comes in
Previously there was always a 1s delay which could even become a 5-8s
delay if the Alarm was not delivered in time.
Bug:
24355754
Change-Id: I1625c69719eee81403a1fcce1358d4d6c9fcf3e9
Bill Rassieur [Mon, 28 Sep 2015 23:09:10 +0000 (23:09 +0000)]
am
c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev
* commit '
c25d546050423845c42a5e8cc8e356caa1f4f71a':
Fix jank: Don't write lockout deadline if not needed
Bill Rassieur [Mon, 28 Sep 2015 23:02:46 +0000 (23:02 +0000)]
Merge "Fix jank: Don't write lockout deadline if not needed" into mnc-dr-dev
Jorim Jaggi [Mon, 28 Sep 2015 20:57:37 +0000 (13:57 -0700)]
Fix jank: Don't write lockout deadline if not needed
In the longterm, we should move these synchronous writes
off the main thread, but in the short term, avoiding an unnecessary
write is good enough for the main case.
Bug:
24471234
Change-Id: Id996ff29e61410cd077760a06d7868a413ae88da
Adam Lesinski [Mon, 28 Sep 2015 17:21:33 +0000 (10:21 -0700)]
Fix asymmetry in parceling/unparceling code for BatteryStats summary
Bug:
24434303
Change-Id: I638979e54076004860035396738f6a1281e26c20
Billy Lau [Mon, 28 Sep 2015 17:31:48 +0000 (17:31 +0000)]
am
86e153d5: am
f360bbca: Merge "Bug:
24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev
* commit '
86e153d5f0614c9f3da137fd0b815a398598928b':
Bug:
24112165 Update docs for protection level of CHANGE_NETWORK_STATE
Billy Lau [Mon, 28 Sep 2015 17:24:25 +0000 (17:24 +0000)]
am
f360bbca: Merge "Bug:
24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev
* commit '
f360bbca969f60ee968240d22bc0b1f1e5e17218':
Bug:
24112165 Update docs for protection level of CHANGE_NETWORK_STATE
Billy Lau [Mon, 28 Sep 2015 17:18:30 +0000 (17:18 +0000)]
Merge "Bug:
24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev
Adam Lesinski [Mon, 28 Sep 2015 07:00:52 +0000 (07:00 +0000)]
am
d5f10154: Bump BatteryStats version
* commit '
d5f10154c772b925f6527e25aeb8461de8c710cd':
Bump BatteryStats version
Adam Lesinski [Sun, 27 Sep 2015 21:24:49 +0000 (21:24 +0000)]
Bump BatteryStats version
Bug:
24434303
Change-Id: I697deb30c211c77c36cdd810259507f965f3b93b
Baligh Uddin [Sun, 27 Sep 2015 20:55:44 +0000 (20:55 +0000)]
am
edd35f92: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
edd35f922c492bb23d266c54e9c69505d3539680':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 20:55:40 +0000 (20:55 +0000)]
am
0307a2a6: (-s ours) Import translations. DO NOT MERGE
* commit '
0307a2a68dd4afceb480d1d0fdc792690ad88df7':
Import translations. DO NOT MERGE