OSDN Git Service
Wale Ogunwale [Mon, 12 Oct 2015 17:13:47 +0000 (17:13 +0000)]
am
4b6a829a: am
83a39080: am
1ca9f481: Merge "Fix resumeHomeStackTask can\'t resume home if activity is finishing."
* commit '
4b6a829ac2c7af671f131a738437f1e393b13ec6':
Fix resumeHomeStackTask can't resume home if activity is finishing.
Geoff Mendal [Mon, 12 Oct 2015 17:13:36 +0000 (17:13 +0000)]
am
94127464: (-s ours) am
99ec3595: (-s ours) am
ef2f6596: (-s ours) am
ac3b53a7: (-s ours) Import translations. DO NOT MERGE
* commit '
94127464b460b65ca6689e1c5156789decca8488':
Import translations. DO NOT MERGE
Pirama Arumuga Nainar [Mon, 12 Oct 2015 17:13:00 +0000 (17:13 +0000)]
am
e1ffb406: am
05f0dc28: am
d5992114: Merge "Fix punctuation and typos in AllocationAdapter\'s documentation."
* commit '
e1ffb406edd5f7bc224669a2f544fad26aff1d31':
Fix punctuation and typos in AllocationAdapter's documentation.
Lorenzo Colitti [Mon, 12 Oct 2015 17:12:19 +0000 (17:12 +0000)]
am
068da682: am
553a934c: am
647ec7f8: am
4e4d59ee: Connect the DHCP UDP socket to the server.
* commit '
068da68200ce5551f1a77ac1e83a3c5157c35701':
Connect the DHCP UDP socket to the server.
Lorenzo Colitti [Mon, 12 Oct 2015 17:12:08 +0000 (17:12 +0000)]
am
3d3f766c: am
871d96b4: am
13c5dd5c: am
eb0bbd45: Merge changes Id6a0b0de,I5f03b8b2,I62464b92 into mnc-dr-dev
* commit '
3d3f766c8b37dcf495235ca4a500494498712eed':
Support DHCP replies with multiple default gateways.
Accept DHCP responses from non-67 server source ports
Improve logging of DHCP parse errors using exceptions.
Geoff Mendal [Mon, 12 Oct 2015 16:16:16 +0000 (16:16 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 12 Oct 2015 16:11:48 +0000 (11:11 -0500)]
Import translations. DO NOT MERGE
Change-Id: Ibf32d55ddcff08c2e57d082666b4121a5a767054
Auto-generated-cl: translation import
Tony Mantler [Mon, 12 Oct 2015 15:56:54 +0000 (15:56 +0000)]
Merge "Move DreamBackend to SettingsLib"
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
Geoff Mendal [Mon, 12 Oct 2015 13:00:47 +0000 (13:00 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 12 Oct 2015 12:55:27 +0000 (05:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I968bf0b2a23bb1b1d15fb7a56880941c85c5a78b
Auto-generated-cl: translation import
Geoff Mendal [Mon, 12 Oct 2015 12:11:44 +0000 (05:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4f298a5bce23a006e6e77bdb199a8e4b5fd37a98
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
Jinsuk Kim [Mon, 5 Oct 2015 05:24:48 +0000 (14:24 +0900)]
CEC: Process missing port/device select request
The timing issue cause some port/device select request
to return error if made while the service is being initialized
waking up from sleep.
This CL buffers the request so that it can be handled as
expected once the service initialization and device discovery
is completed.
Bug:
23084229
Change-Id: I8bcdaf3b708c6b9bf75ea15304c08bd35bd0f6d0
(cherry picked from commit
d0b01dfe0aaebd054165dfe2f5f4bd7d68703970)
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.
Winson Chung [Sat, 10 Oct 2015 21:52:30 +0000 (21:52 +0000)]
Merge "Fixing merge issue with last CL."
Winson [Sat, 10 Oct 2015 21:50:23 +0000 (14:50 -0700)]
Fixing merge issue with last CL.
Change-Id: I71444dafd11427e47387b0652664be21af0c5651
Winson Chung [Sat, 10 Oct 2015 21:46:09 +0000 (21:46 +0000)]
Merge "Fixing crash when dragging tasks to docked state."
Winson [Sat, 10 Oct 2015 21:40:35 +0000 (14:40 -0700)]
Fixing crash when dragging tasks to docked state.
- Also tweaking animation when a task is first picked up.
Change-Id: Idf99c88fdb216823637e2436e54b392b661b9849
Winson Chung [Sat, 10 Oct 2015 19:09:10 +0000 (19:09 +0000)]
Merge "Tweaking animation after dismissing task."
Winson [Sat, 10 Oct 2015 18:51:08 +0000 (11:51 -0700)]
Tweaking animation after dismissing task.
Change-Id: Ia85e876ec08f4103ff5c3799309cf4731922624f
Steve McKay [Sat, 10 Oct 2015 15:54:20 +0000 (15:54 +0000)]
Merge "Rename "recyclerView" to "list" fixing some of CTS."
Steve McKay [Fri, 9 Oct 2015 22:12:40 +0000 (15:12 -0700)]
Rename "recyclerView" to "list" fixing some of CTS.
Bug:
24544391
Change-Id: I2ca74e2a007ec733092d4cb3f84b40c64392c766
Dianne Hackborn [Sat, 10 Oct 2015 01:11:55 +0000 (01:11 +0000)]
am
212fdb2d: am
4b77f2e5: am
94252b62: am
09e405d6: Merge "Fix issue #
24743380: VoiceInteractionManagerService doesn\'t use current..." into mnc-dr-dev
* commit '
212fdb2d1c79cdd6c93dab5b8b32f9118d73a6d9':
Fix issue #
24743380: VoiceInteractionManagerService doesn't use current...
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
Hall Liu [Fri, 9 Oct 2015 23:33:13 +0000 (23:33 +0000)]
Merge "Add TelecomManager constructor for passing in TelecomServiceImpl override"
Hall Liu [Fri, 9 Oct 2015 22:58:37 +0000 (15:58 -0700)]
Add TelecomManager constructor for passing in TelecomServiceImpl
override
Bug:
24618535
Change-Id: I2dafcc9ab496de94eb6a6894916030ed4e7556f8
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
Winson Chung [Fri, 9 Oct 2015 22:37:25 +0000 (22:37 +0000)]
Merge "Cleaning up stack layout."
Winson [Tue, 6 Oct 2015 00:24:00 +0000 (17:24 -0700)]
Cleaning up stack layout.
- Refactoring the layout to remove unused (and confusing) variables,
reducing the number of calculations when updating min/max bounds, and
allow more accurate tracking of stack positions (for attached views).
- Tweaking the transform for single-task stacks so that they behave
better.
- Removing old, unused dismiss-all ui.
Change-Id: I8ec3bf062b0451543bd8a297aa810405f68c84cb
Deepanshu Gupta [Fri, 9 Oct 2015 22:09:56 +0000 (22:09 +0000)]
am
467f6a4f: am
2aa403fe: Merge "LayoutLib: Fix android:dependency for preferences." into mnc-ub-dev
* commit '
467f6a4f0d788fa0bad86bb6545a8254912b99b0':
LayoutLib: Fix android:dependency for preferences.
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
Tony Mantler [Fri, 9 Oct 2015 21:37:32 +0000 (14:37 -0700)]
Move DreamBackend to SettingsLib
Change-Id: Ib0251d48ba287eeca4141eb54b0b0273ef636e63
Wale Ogunwale [Fri, 9 Oct 2015 21:07:29 +0000 (21:07 +0000)]
Merge "Allow apps in home workspace to have non-client-decor."
Wale Ogunwale [Fri, 9 Oct 2015 20:18:44 +0000 (13:18 -0700)]
Allow apps in home workspace to have non-client-decor.
Currently required for apps like recents to resize correctly
with the 2-render thread approach. Eventually we will want to
separate the functionality from the non-client-decor.
Bug:
24742523
Bug:
24810450
Change-Id: Id241bf8fe47dd8c4ec570c90149c859c45aa6285
Svetoslav Ganov [Fri, 9 Oct 2015 19:41:03 +0000 (19:41 +0000)]
Merge "Encapsulate a11y gesture detection in an external class."
Anthony Hugh [Fri, 9 Oct 2015 18:50:23 +0000 (18:50 +0000)]
am
66940eaa: am
073a1624: am
6b566ec5: Merge "Give Android Wear system apps default permission" into cw-e-dev
* commit '
66940eaaabc007d839d17c71b21c914a1bbba2e0':
Give Android Wear system apps default permission
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:48:20 +0000 (17:48 +0000)]
am
8f62f48f: am
d5c27f5a: am
8550261a: am
1078942e: Safely handle interrupts during Thread.join()
* commit '
8f62f48f3bb97d27badd17ff5d0e77c48d9cd830':
Safely handle interrupts during Thread.join()
Pirama Arumuga Nainar [Fri, 9 Oct 2015 17:48:12 +0000 (17:48 +0000)]
am
f677c098: am
70bb3f3d: am
bc7391d8: resolved conflicts for
93db3d4b to cw-e-dev
* commit '
f677c098c10ee473e45d31bf5042cc38024a4f8a':
Retry if interrupted before mMessageThread has joined
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."
Wale Ogunwale [Fri, 9 Oct 2015 14:36:18 +0000 (14:36 +0000)]
Merge "Only request traversals if status bar visibility changed on reevaluation"
John Reck [Fri, 9 Oct 2015 14:16:04 +0000 (14:16 +0000)]
Merge "Super-fast getLineWidth for BL"
Mahaver Chopra [Thu, 8 Oct 2015 16:58:45 +0000 (17:58 +0100)]
Documentation of EXTRA_PROVISIONING_WIFI_SECURITY_TYPE
Valid values for EXTRA_PROVISIONING_WIFI_SECURITY_TYPE in the documentation
Bug:
23379302
Change-Id: I039432d81de6834c01bbe6ca0fc668afec38d040
Lorenzo Colitti [Fri, 9 Oct 2015 06:35:51 +0000 (06:35 +0000)]
Merge "Log UID and PID of legacy route requests."
Wale Ogunwale [Fri, 9 Oct 2015 06:04:35 +0000 (06:04 +0000)]
Merge "Update dock divider display info. whenever it changes."
Wale Ogunwale [Fri, 9 Oct 2015 06:03:43 +0000 (06:03 +0000)]
Merge "Fixed NPE when getting stack for dock divider."
Wale Ogunwale [Fri, 9 Oct 2015 03:18:14 +0000 (20:18 -0700)]
Only request traversals if status bar visibility changed on reevaluation
Reduces the amount of churn in the system.
Change-Id: Ic1e93f1ed511fe95c551c08a06e239f0e5de93a0
Wale Ogunwale [Fri, 9 Oct 2015 05:01:06 +0000 (22:01 -0700)]
Update dock divider display info. whenever it changes.
The docked divider display info. was set on object creation and never
changed. This can hang the dock divider if the device rotation is
changed and the user moves the divider rapidly in and out of the
screen edge closer to the right. We now update the display info.
whenever it changes.
Change-Id: Ie5f0c7ebdafedb156d04eceee00fc7e4176d9bf8
Lorenzo Colitti [Fri, 9 Oct 2015 04:36:02 +0000 (04:36 +0000)]
Merge "Connect the DHCP UDP socket to the server."
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: I82fe9d6c6c520536ffd6422bcc60fab664999e6f
Lorenzo Colitti [Fri, 4 Sep 2015 04:12:42 +0000 (13:12 +0900)]
Log UID and PID of legacy route requests.
Bug:
23801105
Change-Id: I1722af0424f5b9bbd7276b77ce1571842fa541b3
Lorenzo Colitti [Fri, 9 Oct 2015 04:04:27 +0000 (04:04 +0000)]
Merge "Add a null check to hasIPv4AddressOnInterface."
Lorenzo Colitti [Thu, 30 Jul 2015 14:41:43 +0000 (23:41 +0900)]
Add a null check to hasIPv4AddressOnInterface.
Change-Id: Ie38505ec0a93f4060348d92db341c536b7d60ed0
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)
Wale Ogunwale [Fri, 9 Oct 2015 01:09:02 +0000 (18:09 -0700)]
Fixed NPE when getting stack for dock divider.
Also, don't try to resize non-existing stack when transitioning
docked stack to fullscreen.
Change-Id: Ie8b0e1ef7f4265f9133ce9b47e6f9a5db27dbad7
Wale Ogunwale [Fri, 9 Oct 2015 00:43:42 +0000 (00:43 +0000)]
Merge "Schedule traversal instead performing it directly."
Filip Gruszczynski [Fri, 9 Oct 2015 00:24:11 +0000 (17:24 -0700)]
Schedule traversal instead performing it directly.
Performing layout traversal directly while evaluating status bar
visibility causes a recursive entry into layout traversal. We should
instead schedule another pass.
Change-Id: Ieb19a53f409863a45032a876d0b2bd2dfe8c30c6
Filip Gruszczynski [Fri, 9 Oct 2015 00:08:39 +0000 (00:08 +0000)]
am
e76aa227: am
0b45c2f8: am
21b37a5f: Merge "Make accessing mInputMethodTarget thread-safe"
* commit '
e76aa2275b63ec6502beedcf70e318563a126136':
Make accessing mInputMethodTarget thread-safe
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
Wale Ogunwale [Thu, 8 Oct 2015 23:33:10 +0000 (23:33 +0000)]
Merge "Synchronize critical sections in NonClientDecorView.ResizeFrameThread"
Wale Ogunwale [Thu, 8 Oct 2015 23:04:23 +0000 (23:04 +0000)]
Merge "Added rules for status/nav bar customization when in multi-window mode"
Julia Reynolds [Thu, 8 Oct 2015 22:27:10 +0000 (22:27 +0000)]
Merge "Remove rename automatic zen rule."
Hui Shu [Thu, 8 Oct 2015 22:23:03 +0000 (22:23 +0000)]
Merge "Format the Javadoc using <p>"
Chet Haase [Thu, 8 Oct 2015 21:07:30 +0000 (21:07 +0000)]
Merge "Fix ValueAnimator.getCurrentPlayTime()"
Jason Monk [Thu, 8 Oct 2015 20:44:52 +0000 (20:44 +0000)]
am
b2fae9bf: am
4e33c1c3: am
3a409081: am
29433f70: Merge "Actually apply after no sims change." into mnc-dr-dev
* commit '
b2fae9bf2aeb682ce55a3ceb33f91da5f6b5bcc6':
Actually apply after no sims change.
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.