OSDN Git Service
Miao Wang [Mon, 12 Oct 2015 17:04:11 +0000 (17:04 +0000)]
am
41333316: am
46811dd9: am
c4c42d55: Merge "[RenderScript] pass correct length of ains to BLAS functions" into mnc-dr-dev
* commit '
41333316d7aead817295d163618da7931200534b':
[RenderScript] pass correct length of ains to BLAS functions
Miao Wang [Mon, 12 Oct 2015 16:57:15 +0000 (16:57 +0000)]
am
46811dd9: am
c4c42d55: Merge "[RenderScript] pass correct length of ains to BLAS functions" into mnc-dr-dev
* commit '
46811dd9df0cbef68f69e938a52b418ba927882a':
[RenderScript] pass correct length of ains to BLAS functions
Jeff Sharkey [Mon, 12 Oct 2015 16:56:03 +0000 (16:56 +0000)]
am
97604b42: am
9f1ae4dc: am
fe9c950a: Merge "Fix parole scheduling bugs." into mnc-dr-dev
* commit '
97604b42d997e0c577d33c21f7a48ef1a73185ab':
Fix parole scheduling bugs.
Jeff Sharkey [Mon, 12 Oct 2015 16:55:58 +0000 (16:55 +0000)]
am
75051c3a: am
7f6d8754: am
a03ecf7d: Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev
* commit '
75051c3a62123b4668231d0243ba11462e02ac5a':
Push firewall rules up to ConnectivityService.
Jeff Sharkey [Mon, 12 Oct 2015 16:55:52 +0000 (16:55 +0000)]
am
8feaed95: am
da5d9af8: am
fe45f1b9: Merge "Default location is "internalOnly" when undefined." into mnc-dr-dev
* commit '
8feaed95cfc79cc96a0c0a18c3db8154dd9f551a':
Default location is "internalOnly" when undefined.
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
Jeff Sharkey [Mon, 12 Oct 2015 16:49:05 +0000 (16:49 +0000)]
am
9f1ae4dc: am
fe9c950a: Merge "Fix parole scheduling bugs." into mnc-dr-dev
* commit '
9f1ae4dc260d099834d386cf1d0074ff54b3f50f':
Fix parole scheduling bugs.
Jeff Sharkey [Mon, 12 Oct 2015 16:48:59 +0000 (16:48 +0000)]
am
7f6d8754: am
a03ecf7d: Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev
* commit '
7f6d8754e6d509bf17fe0c46130c884b16706b12':
Push firewall rules up to ConnectivityService.
Jeff Sharkey [Mon, 12 Oct 2015 16:48:53 +0000 (16:48 +0000)]
am
da5d9af8: am
fe45f1b9: Merge "Default location is "internalOnly" when undefined." into mnc-dr-dev
* commit '
da5d9af80530e6bf662178668bef3ef3b926fe73':
Default location is "internalOnly" when undefined.
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:21:20 +0000 (16:21 +0000)]
am
f6747190: am
04166953: am
6be61a98: wm: call displayReady for all built in displays when system is ready.
* commit '
f67471900a36d272aac77425274593495331fcbc':
wm: call displayReady for all built in displays when system is ready.
Vinu Deokaran [Mon, 12 Oct 2015 16:16:31 +0000 (16:16 +0000)]
am
04166953: am
6be61a98: wm: call displayReady for all built in displays when system is ready.
* commit '
0416695348eae12cae0baa5adee65004d0caabe5':
wm: call displayReady for all built in displays when system is ready.
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
Wale Ogunwale [Mon, 12 Oct 2015 14:50:32 +0000 (14:50 +0000)]
am
83a39080: am
1ca9f481: Merge "Fix resumeHomeStackTask can\'t resume home if activity is finishing."
* commit '
83a3908047f3438c5daf7c3b562cf9ad8fe76d71':
Fix resumeHomeStackTask can't resume home if activity is finishing.
Wale Ogunwale [Mon, 12 Oct 2015 14:44:46 +0000 (14:44 +0000)]
am
1ca9f481: Merge "Fix resumeHomeStackTask can\'t resume home if activity is finishing."
* commit '
1ca9f4812749a3eff0654e2ea7773e8b3704c1da':
Fix resumeHomeStackTask can't resume home if activity is finishing.
Wale Ogunwale [Mon, 12 Oct 2015 14:39:16 +0000 (14:39 +0000)]
Merge "Fix resumeHomeStackTask can't resume home if activity is finishing."
Geoff Mendal [Mon, 12 Oct 2015 14:34:53 +0000 (14:34 +0000)]
am
99ec3595: (-s ours) am
ef2f6596: (-s ours) am
ac3b53a7: (-s ours) Import translations. DO NOT MERGE
* commit '
99ec3595002f98e4c67a8c23e8ef33590e460235':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 14:27:25 +0000 (14:27 +0000)]
am
ef2f6596: (-s ours) am
ac3b53a7: (-s ours) Import translations. DO NOT MERGE
* commit '
ef2f659641d3eec9129ad726176c27818cc9d4d0':
Import translations. DO NOT MERGE
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
Mark Lu [Thu, 8 Oct 2015 05:31:01 +0000 (13:31 +0800)]
Fix resumeHomeStackTask can't resume home if activity is finishing.
Not to resume home activity in finishing stage as following case:
When only home task has 2 activities,
(ex: SetupWizard & DeviceOwnerProvisioningActivity),
If SetupWizard crashed during DeviceOwnerProvisioningActivity in
finishing stage,
makes DeviceOwnerProvisioningActivity cannot destroy immediately,
In resumeHomeStackTask, will resume DeviceOwnerProvisioningActivity
(returned by getHomeActivity),
But actually, DeviceOwnerProvisioningActivity cannot be resumed.
Caused ANR when back key since no more running activity can resume.
Change-Id: Icec49e092d2e7bee7f6a2d198913c1c5db7122f2
Pirama Arumuga Nainar [Sun, 11 Oct 2015 18:07:37 +0000 (18:07 +0000)]
am
05f0dc28: am
d5992114: Merge "Fix punctuation and typos in AllocationAdapter\'s documentation."
* commit '
05f0dc2891377ab21b3a4262e9f5dc6fc768a2af':
Fix punctuation and typos in AllocationAdapter's documentation.
Lorenzo Colitti [Sun, 11 Oct 2015 14:20:04 +0000 (14:20 +0000)]
am
553a934c: am
647ec7f8: am
4e4d59ee: Connect the DHCP UDP socket to the server.
* commit '
553a934c47ec255b84647fa8e603bd4edf8fd7cd':
Connect the DHCP UDP socket to the server.
Lorenzo Colitti [Sun, 11 Oct 2015 14:19:58 +0000 (14:19 +0000)]
am
871d96b4: am
13c5dd5c: am
eb0bbd45: Merge changes Id6a0b0de,I5f03b8b2,I62464b92 into mnc-dr-dev
* commit '
871d96b44c9665238d1df87ed89656f742abe2fa':
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 [Sun, 11 Oct 2015 14:11:31 +0000 (14:11 +0000)]
am
647ec7f8: am
4e4d59ee: Connect the DHCP UDP socket to the server.
* commit '
647ec7f80e46aa7c9b251d942bc2862646b57b3f':
Connect the DHCP UDP socket to the server.
Lorenzo Colitti [Sun, 11 Oct 2015 14:11:25 +0000 (14:11 +0000)]
am
13c5dd5c: am
eb0bbd45: Merge changes Id6a0b0de,I5f03b8b2,I62464b92 into mnc-dr-dev
* commit '
13c5dd5c19c5bcc60910b4e37f4e9e171adf099b':
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 [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 01:06:27 +0000 (01:06 +0000)]
am
4b77f2e5: am
94252b62: am
09e405d6: Merge "Fix issue #
24743380: VoiceInteractionManagerService doesn\'t use current..." into mnc-dr-dev
* commit '
4b77f2e53dba8288642aa6223658560eb2faeaf5':
Fix issue #
24743380: VoiceInteractionManagerService doesn't use current...
Dianne Hackborn [Sat, 10 Oct 2015 00:56:59 +0000 (00:56 +0000)]
am
94252b62: am
09e405d6: Merge "Fix issue #
24743380: VoiceInteractionManagerService doesn\'t use current..." into mnc-dr-dev
* commit '
94252b62079f8c852daca62d834d1680e3a602da':
Fix issue #
24743380: VoiceInteractionManagerService doesn't use current...
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
Deepanshu Gupta [Fri, 9 Oct 2015 22:04:16 +0000 (22:04 +0000)]
am
2aa403fe: Merge "LayoutLib: Fix android:dependency for preferences." into mnc-ub-dev
* commit '
2aa403fe0c86291c6fd65317e93a72549e6e10de':
LayoutLib: Fix android:dependency for preferences.
Deepanshu Gupta [Fri, 9 Oct 2015 21:58:05 +0000 (21:58 +0000)]
Merge "LayoutLib: Fix android:dependency for preferences." into mnc-ub-dev
Deepanshu Gupta [Fri, 9 Oct 2015 21:54:19 +0000 (14:54 -0700)]
LayoutLib: Fix android:dependency for preferences.
Bug: http://b.android.com/189314
Change-Id: I229632d11a2529e865f3f2e8eca3a78b47ad462c
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:36:42 +0000 (18:36 +0000)]
am
073a1624: am
6b566ec5: Merge "Give Android Wear system apps default permission" into cw-e-dev
* commit '
073a1624912a93da65b5e40b6ff434c4fd3ab0f2':
Give Android Wear system apps default permission
Anthony Hugh [Fri, 9 Oct 2015 18:32:07 +0000 (18:32 +0000)]
am
6b566ec5: Merge "Give Android Wear system apps default permission" into cw-e-dev
* commit '
6b566ec5fd8751175bea4bb161cf78502f1a79e8':
Give Android Wear system apps default permission
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:43:40 +0000 (17:43 +0000)]
am
d5c27f5a: am
8550261a: am
1078942e: Safely handle interrupts during Thread.join()
* commit '
d5c27f5ab8e5e0ce8b40163df42c5fe522724138':
Safely handle interrupts during Thread.join()
Pirama Arumuga Nainar [Fri, 9 Oct 2015 17:43:34 +0000 (17:43 +0000)]
am
70bb3f3d: am
bc7391d8: resolved conflicts for
93db3d4b to cw-e-dev
* commit '
70bb3f3d43b4e41aa09f085de6dccc00e57e7218':
Retry if interrupted before mMessageThread has joined
Pirama Arumuga Nainar [Fri, 9 Oct 2015 17:37:50 +0000 (17:37 +0000)]
am
8550261a: am
1078942e: Safely handle interrupts during Thread.join()
* commit '
8550261afb0ab39e0b84ba77d834b56fe45e590c':
Safely handle interrupts during Thread.join()
Pirama Arumuga Nainar [Fri, 9 Oct 2015 17:37:44 +0000 (17:37 +0000)]
am
bc7391d8: resolved conflicts for
93db3d4b to cw-e-dev
* commit '
bc7391d81a0d224a52124fdc87c0ab0cca453917':
Retry if interrupted before mMessageThread has joined
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, 9 Oct 2015 17:03:14 +0000 (17:03 +0000)]
am
d5992114: Merge "Fix punctuation and typos in AllocationAdapter\'s documentation."
* commit '
d59921149bb5948ffbcb9a9e832e9ac1538e05a0':
Fix punctuation and typos in AllocationAdapter's documentation.
Pirama Arumuga Nainar [Fri, 9 Oct 2015 16:57:54 +0000 (16:57 +0000)]
Merge "Fix punctuation and typos in AllocationAdapter's documentation."
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)
Filip Gruszczynski [Fri, 9 Oct 2015 00:01:09 +0000 (00:01 +0000)]
am
0b45c2f8: am
21b37a5f: Merge "Make accessing mInputMethodTarget thread-safe"
* commit '
0b45c2f87c0285b42eef96bbb8950d225334c60e':
Make accessing mInputMethodTarget thread-safe
Filip Gruszczynski [Thu, 8 Oct 2015 23:54:13 +0000 (23:54 +0000)]
am
21b37a5f: Merge "Make accessing mInputMethodTarget thread-safe"
* commit '
21b37a5fb46f3dcd20bba0c621d8859e1c8dc32e':
Make accessing mInputMethodTarget thread-safe
Filip Gruszczynski [Thu, 8 Oct 2015 23:50:17 +0000 (23:50 +0000)]
Merge "Make accessing mInputMethodTarget thread-safe"
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:38:03 +0000 (20:38 +0000)]
am
4e33c1c3: am
3a409081: am
29433f70: Merge "Actually apply after no sims change." into mnc-dr-dev
* commit '
4e33c1c312be549ca155b35b24938076ef30f414':
Actually apply after no sims change.
Jason Monk [Thu, 8 Oct 2015 20:31:51 +0000 (20:31 +0000)]
am
3a409081: am
29433f70: Merge "Actually apply after no sims change." into mnc-dr-dev
* commit '
3a40908185f7db6488f773fe2060a10c00db74db':
Actually apply after no sims change.
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
Pirama Arumuga Nainar [Thu, 8 Oct 2015 02:59:48 +0000 (19:59 -0700)]
Fix punctuation and typos in AllocationAdapter's documentation.
Change-Id: I5574ff201b857a29f30ebe8413dbe4128dcff3ae
Jeff Sharkey [Thu, 8 Oct 2015 17:23:11 +0000 (17:23 +0000)]
am
e0210648: am
a0ef1048: am
d473a144: Merge "Hold wake-lock during copy operations." into mnc-dr-dev
* commit '
e0210648d82a4816218e057a6bf52ee946ee9530':
Hold wake-lock during copy operations.
Jeff Sharkey [Thu, 8 Oct 2015 17:09:29 +0000 (17:09 +0000)]
am
a0ef1048: am
d473a144: Merge "Hold wake-lock during copy operations." into mnc-dr-dev
* commit '
a0ef104882b1a0edd79badb2f327cc8722f76bb2':
Hold wake-lock during copy operations.
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:20:01 +0000 (09:20 +0000)]
am
d621ee11: am
edc3585f: am
0a1f0e56: Merge "Add ESC mapping for Pixel C keyboard" into mnc-dr-dev
* commit '
d621ee11fa76d7dd803a802bf000baa591c84fbe':
Add ESC mapping for Pixel C keyboard
Puneet Kumar [Thu, 8 Oct 2015 09:19:55 +0000 (09:19 +0000)]
am
0068ea5b: am
8810285f: am
06d1254c: Merge "Add layout and keymap for Pixel C Bluetooth keyboard" into mnc-dr-dev
* commit '
0068ea5bf7c9988174b0991eb87bb09f5838c39c':
Add layout and keymap for Pixel C Bluetooth keyboard
Puneet Kumar [Thu, 8 Oct 2015 09:15:31 +0000 (09:15 +0000)]
am
edc3585f: am
0a1f0e56: Merge "Add ESC mapping for Pixel C keyboard" into mnc-dr-dev
* commit '
edc3585ffd1ce17f12b808f0473ebc582e159132':
Add ESC mapping for Pixel C keyboard
Puneet Kumar [Thu, 8 Oct 2015 09:15:25 +0000 (09:15 +0000)]
am
8810285f: am
06d1254c: Merge "Add layout and keymap for Pixel C Bluetooth keyboard" into mnc-dr-dev
* commit '
8810285fa54f788cc78ae7777db8ccfe57436e30':
Add layout and keymap for Pixel C Bluetooth keyboard
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:39:16 +0000 (23:39 +0000)]
am
6c271b89: am
f3acc630: am
01356906: Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev
* commit '
6c271b898c080303c24e524022dd6e4552bda5f5':
Ensure SurfaceView requests WM relayout when size changes.
Tim Murray [Wed, 7 Oct 2015 23:32:28 +0000 (23:32 +0000)]
am
f3acc630: am
01356906: Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev
* commit '
f3acc63015cb3093c3bdc11f6dbd1db2f375eeca':
Ensure SurfaceView requests WM relayout when size changes.
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.
Chien-Yu Chen [Wed, 7 Oct 2015 23:22:24 +0000 (23:22 +0000)]
am
d07d0071: am
02e4400c: am
ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev
* commit '
d07d007161e2f64e88eba9f78778ab63b3dd6ab9':
MediaActionSound: Fix video stop sound
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:17:39 +0000 (23:17 +0000)]
am
02e4400c: am
ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev
* commit '
02e4400cc734079bcc275d14a9ae4d16609403c8':
MediaActionSound: Fix video stop sound
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:54:41 +0000 (21:54 +0000)]
am
527da81f: am
a71bb6b9: am
9d688336: am
a636be6c: Camera: fix wrong FULL feature string
* commit '
527da81f13fa65b924859ae87f6ccce8d3614140':
Camera: fix wrong FULL feature string
Yin-Chia Yeh [Wed, 7 Oct 2015 21:50:17 +0000 (21:50 +0000)]
am
a71bb6b9: am
9d688336: am
a636be6c: Camera: fix wrong FULL feature string
* commit '
a71bb6b986156b8bd32e387afc74b1ff066fd2a7':
Camera: fix wrong FULL feature string
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
Deepanshu Gupta [Wed, 7 Oct 2015 21:23:43 +0000 (21:23 +0000)]
am
9969f858: LayoutLib: Fix ring rendering.
* commit '
9969f858c34ba7e35a977c819f2d1e24de586990':
LayoutLib: Fix ring rendering.
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)