TreeHugger Robot
53db761efb
Merge "Avoid NPE around mReusedTask of ActivityStarter" into nyc-mr2-dev
2016-12-05 22:41:24 +00:00
Christine Franks
b10e339774
Merge "TwilightService: Ignore (0,0) coordinate location updates" into nyc-mr2-dev
2016-12-05 22:38:14 +00:00
TreeHugger Robot
4eaf8c2d9b
Merge "sysui: fix navbar button view orientation" into nyc-mr2-dev
2016-12-05 21:22:03 +00:00
Shunta Sato
9fff53f2cb
Avoid NPE around mReusedTask of ActivityStarter
...
Symptom:
System crash by NPE is observed on ActivityStarter
during phone boot-up.
Detail and sample:
ActivityStarter has possibility to be called itself recursively
by calling TaskRecord$performClearTaskLocked().
Then class variable of mReusedTask is initialized to null
after the call, because the recursive call isn't guarded by
synchronized block.
Then NPE crash occurs on next statement.
Solutions:
Call performClearTaskLocked() before assigning
intentActivity.task to mReusedTask.
Bug: 32361138
Test: builds, boots, Manual testing of condition in bug
Author: Shigeki Yokomichi <shigeki.x.yokomichi@sonymobile.com >
Change-Id: Iaea3e066a6f7134fcae4338ff864bb236241194c
(cherry picked from commit 0bd28e2c5f
2016-12-05 12:58:25 -08:00
Xiaohui Chen
33db4b77d5
Merge "Fix vertical nav button direction issue" into nyc-mr2-dev
2016-12-05 19:20:19 +00:00
Christine Franks
cc2801296d
TwilightService: Ignore (0,0) coordinate location updates
...
Location providers may erroneously return (0.0, 0.0) when they
fail to determine the device's location. These location updates
can be safely ignored since the chance of a user actually being
at these coordinates is quite low.
Bug: 31009261
Test: added TwilightServiceTest; both tests pass
Change-Id: Ie9d7d10f81ade9b0be10f98ed74978539efaa658
2016-12-05 11:19:42 -08:00
Bill Yi
a1b10fcdb9
Merge "Revert "Import translations. DO NOT MERGE"" into nyc-mr2-dev
2016-12-05 18:35:38 +00:00
Bill Yi
05ab7a37a4
Revert "Import translations. DO NOT MERGE"
...
This reverts commit 52ae3289fb
2016-12-05 18:35:00 +00:00
TreeHugger Robot
8c917322a7
Merge "To enable scroll function at DatePickerDialog" into nyc-mr2-dev
2016-12-05 18:23:57 +00:00
Michael Kwan
9120012566
Disable swipe-to-dismiss for not cancelable dialogs.
...
am: f7964be938
2016-12-05 18:09:07 +00:00
Bill Yi
52ae3289fb
Import translations. DO NOT MERGE
...
Change-Id: Ifb7cde4b8e869f98f49a2fb0270bc9cd30ed7b0d
Auto-generated-cl: translation import
2016-12-03 00:20:58 -08:00
Michael Kwan
f7964be938
Disable swipe-to-dismiss for not cancelable dialogs.
...
Bug: 33249829
Change-Id: Ib3d2c9982ece22d1b080b821eaf306f6b686d099
2016-12-02 17:33:56 -08:00
Tenghui Zhu
c6ee7e317f
Merge "Update the documentation related to VD / AVD" into nyc-mr2-dev
2016-12-02 22:25:04 +00:00
Xiaohui Chen
7917006430
sysui: fix navbar button view orientation
...
Before navbar assumes rotation 0 means portrait and rotation 90
means landscape. This is not necessarily true, in certain devices
the natural orientation (0) is landscape. Here we removed that
assumption and make sure we use the right inflater at all times.
Bug: 32516898
Change-Id: I325b8f61877827b19aa5b7b5cda49cb3523d2ed6
Merged-in: I3db44dcb35d8511fb9d42b147b2bd137ff0750f7
2016-12-02 14:21:06 -08:00
Xiaohui Chen
854bc8ea1e
Fix vertical nav button direction issue
...
Bug: 32516898
Change-Id: I00d5478b9bef87918d59f3021a9368fd3f2e0c20
Test: locally on device
Merged-In: Id94f08c066db101f630e69874bcdefb177e6f0f5
2016-12-02 14:20:07 -08:00
Jeff Sharkey
06f0764320
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours am: ce477912a2 am: 920b02a94f -s ours am: aff9286bd6 am: 37ff2d56bf am: 56247334f8 am: 923aef8e02 -s ours am: f199d511c3 am: 1d752340a7 am: 4aacfce724
...
am: 5b64f51a1c
2016-12-02 20:37:55 +00:00
Jeff Sharkey
29e38b212f
DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa am: a1d1ecbe05 -s ours am: 928c09cd8e am: 5267b63325 am: a51ebb828a am: acfda3d71a -s ours am: 0eaa192436 am: 43b3a13803 am: 6786309c03
...
am: a43ee01a6d
2016-12-02 20:36:51 +00:00
Jeff Sharkey
375f16eff4
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 am: a7efe16fe1 -s ours am: f1085f2dc8 am: c130d7fd5e am: 948841362a am: 7e54dc58d4 -s ours am: 3fa188bd8f am: 09960bdfcc am: d12e48494d
...
am: 341813c852
2016-12-02 20:35:56 +00:00
Jeff Sharkey
00cc40c40a
DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb5 -s ours am: 32af84320b am: 8b5fa0c0c0 am: d081cb0ab7 am: cd35e746dc -s ours am: 836b54e6bb am: 383e0cfa06 am: a55258bd17
...
am: 2f48a6ce63
2016-12-02 20:35:06 +00:00
Jeff Sharkey
5b64f51a1c
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours am: ce477912a2 am: 920b02a94f -s ours am: aff9286bd6 am: 37ff2d56bf am: 56247334f8 am: 923aef8e02 -s ours am: f199d511c3 am: 1d752340a7
...
am: 4aacfce724
2016-12-02 20:20:39 +00:00
Jeff Sharkey
a43ee01a6d
DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa am: a1d1ecbe05 -s ours am: 928c09cd8e am: 5267b63325 am: a51ebb828a am: acfda3d71a -s ours am: 0eaa192436 am: 43b3a13803
...
am: 6786309c03
2016-12-02 20:19:28 +00:00
Jeff Sharkey
341813c852
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 am: a7efe16fe1 -s ours am: f1085f2dc8 am: c130d7fd5e am: 948841362a am: 7e54dc58d4 -s ours am: 3fa188bd8f am: 09960bdfcc
...
am: d12e48494d
2016-12-02 20:18:32 +00:00
Jeff Sharkey
2f48a6ce63
DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb5 -s ours am: 32af84320b am: 8b5fa0c0c0 am: d081cb0ab7 am: cd35e746dc -s ours am: 836b54e6bb am: 383e0cfa06
...
am: a55258bd17
2016-12-02 20:17:33 +00:00
TreeHugger Robot
3eda32cc71
Merge changes from topic 'fast-bss-transition' into nyc-mr2-dev
...
* changes:
Add capability flag for 802.11r fast BSS transition
Add constants for 802.11r
2016-12-02 20:14:11 +00:00
Jakub Pawlowski
c977c776c2
Merge changes from topic 'ble_oob_sc_mr2' into nyc-mr2-dev
...
* changes:
BLE OOB Pairing - parse address type (5/5)
Fix Bluetooth OOB pairing not working for unseen devices
Add LE Secure Connection data parsing (1/4)
2016-12-02 20:14:03 +00:00
Jeff Sharkey
4aacfce724
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours am: ce477912a2 am: 920b02a94f -s ours am: aff9286bd6 am: 37ff2d56bf am: 56247334f8 am: 923aef8e02 -s ours am: f199d511c3
...
am: 1d752340a7
2016-12-02 20:11:33 +00:00
Jeff Sharkey
6786309c03
DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa am: a1d1ecbe05 -s ours am: 928c09cd8e am: 5267b63325 am: a51ebb828a am: acfda3d71a -s ours am: 0eaa192436
...
am: 43b3a13803
2016-12-02 20:10:37 +00:00
Jeff Sharkey
d12e48494d
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 am: a7efe16fe1 -s ours am: f1085f2dc8 am: c130d7fd5e am: 948841362a am: 7e54dc58d4 -s ours am: 3fa188bd8f
...
am: 09960bdfcc
2016-12-02 20:09:34 +00:00
Jeff Sharkey
a55258bd17
DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb5 -s ours am: 32af84320b am: 8b5fa0c0c0 am: d081cb0ab7 am: cd35e746dc -s ours am: 836b54e6bb
...
am: 383e0cfa06
2016-12-02 20:08:37 +00:00
Jeff Sharkey
1d752340a7
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours am: ce477912a2 am: 920b02a94f -s ours am: aff9286bd6 am: 37ff2d56bf am: 56247334f8 am: 923aef8e02 -s ours
...
am: f199d511c3
2016-12-02 19:55:09 +00:00
Jeff Sharkey
43b3a13803
DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa am: a1d1ecbe05 -s ours am: 928c09cd8e am: 5267b63325 am: a51ebb828a am: acfda3d71a -s ours
...
am: 0eaa192436
2016-12-02 19:54:12 +00:00
Jeff Sharkey
09960bdfcc
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 am: a7efe16fe1 -s ours am: f1085f2dc8 am: c130d7fd5e am: 948841362a am: 7e54dc58d4 -s ours
...
am: 3fa188bd8f
2016-12-02 19:53:09 +00:00
Jeff Sharkey
383e0cfa06
DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb5 -s ours am: 32af84320b am: 8b5fa0c0c0 am: d081cb0ab7 am: cd35e746dc -s ours
...
am: 836b54e6bb
2016-12-02 19:52:04 +00:00
Jeff Sharkey
1157adb305
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9" into cw-f-dev
...
am: 2e73db5b9c
2016-12-02 19:51:21 +00:00
Jeff Sharkey
9ce28af49c
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9
...
am: 17d6ba41b8
2016-12-02 19:47:38 +00:00
Jeff Sharkey
f199d511c3
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours am: ce477912a2 am: 920b02a94f -s ours am: aff9286bd6 am: 37ff2d56bf am: 56247334f8
...
am: 923aef8e02
2016-12-02 19:46:36 +00:00
Jeff Sharkey
f196c044f3
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9
...
am: 5bf382063d
2016-12-02 19:46:22 +00:00
Jeff Sharkey
0eaa192436
DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa am: a1d1ecbe05 -s ours am: 928c09cd8e am: 5267b63325 am: a51ebb828a
...
am: acfda3d71a
2016-12-02 19:45:33 +00:00
Jeff Sharkey
d01f22d0b2
DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275
...
am: 71e4281969
2016-12-02 19:45:19 +00:00
Jeff Sharkey
3fa188bd8f
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 am: a7efe16fe1 -s ours am: f1085f2dc8 am: c130d7fd5e am: 948841362a
...
am: 7e54dc58d4
2016-12-02 19:44:38 +00:00
Jeff Sharkey
b46e9bb9cb
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063
...
am: a75ce3a705
2016-12-02 19:44:25 +00:00
Jeff Sharkey
836b54e6bb
DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb5 -s ours am: 32af84320b am: 8b5fa0c0c0 am: d081cb0ab7
...
am: cd35e746dc
2016-12-02 19:43:33 +00:00
Jeff Sharkey
dd09c12a61
DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac
...
am: 10cdb1130e
2016-12-02 19:43:28 +00:00
Android Build Merger (Role)
2e73db5b9c
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9" into cw-f-dev
2016-12-02 19:33:12 +00:00
Jeff Sharkey
17d6ba41b8
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929
...
am: f00515f4d9
2016-12-02 19:32:36 +00:00
Jeff Sharkey
923aef8e02
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours am: ce477912a2 am: 920b02a94f -s ours am: aff9286bd6 am: 37ff2d56bf
...
am: 56247334f8
2016-12-02 19:29:15 +00:00
Jeff Sharkey
5bf382063d
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929
...
am: f00515f4d9
2016-12-02 19:29:14 +00:00
Jeff Sharkey
acfda3d71a
DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa am: a1d1ecbe05 -s ours am: 928c09cd8e am: 5267b63325
...
am: a51ebb828a
2016-12-02 19:28:18 +00:00
Jeff Sharkey
71e4281969
DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad
...
am: 12b2f8a275
2016-12-02 19:28:14 +00:00
Jeff Sharkey
a75ce3a705
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e
...
am: 07ad2a9063
2016-12-02 19:27:26 +00:00
