OSDN Git Service
Chris Tate [Fri, 5 May 2017 01:22:11 +0000 (01:22 +0000)]
Merge "Correct scope of "disabled?" check viz backup/restore decisions" into oc-dev
am:
d239223cb0
Change-Id: Ic7e8bb17ae800ec1eac9ba3eef5ffb70260b72ba
Chris Tate [Fri, 5 May 2017 01:10:38 +0000 (01:10 +0000)]
Merge "Correct scope of "disabled?" check viz backup/restore decisions" into oc-dev
Aurimas Liutikas [Fri, 5 May 2017 00:50:09 +0000 (00:50 +0000)]
Merge "Avoid reflection when mocking UserManagerService" into oc-dev
am:
bd886e52b8
Change-Id: I60ec8831c730ed2eeb2092ea6d96421497dbd5e7
Amit Mahajan [Fri, 5 May 2017 00:48:00 +0000 (00:48 +0000)]
Merge "Use sim language for VZW." into oc-dev
am:
87b544c406
Change-Id: If693c1b4827b7a3ee6633565932da433627ddb21
Aurimas Liutikas [Fri, 5 May 2017 00:40:37 +0000 (00:40 +0000)]
Merge "Avoid reflection when mocking UserManagerService" into oc-dev
Amit Mahajan [Fri, 5 May 2017 00:39:30 +0000 (00:39 +0000)]
Merge "Use sim language for VZW." into oc-dev
Android Build Merger (Role) [Thu, 4 May 2017 23:54:21 +0000 (23:54 +0000)]
Merge "Merge "Stack is visible if behind docked which is behind pinned stack (1/2)" into oc-dev am:
b2edabadee" into oc-dev-plus-aosp
Matthew Ng [Thu, 4 May 2017 23:53:31 +0000 (23:53 +0000)]
Merge "Stack is visible if behind docked which is behind pinned stack (1/2)" into oc-dev
am:
b2edabadee
Change-Id: I69da4e74362247c4168f56ce2b23e6b03a2737e6
Matthew Ng [Thu, 4 May 2017 23:40:58 +0000 (23:40 +0000)]
Merge "Stack is visible if behind docked which is behind pinned stack (1/2)" into oc-dev
am:
b2edabadee
Change-Id: I91abd7cfa4889adf289966024aad4d0d2460dbf0
Ajay Panicker [Thu, 4 May 2017 23:22:30 +0000 (23:22 +0000)]
Merge "Limit btsnoop file size (3/9)" into oc-dev
am:
4d1fb218f4
Change-Id: I587722c6408067b45331f10a7bfbb55c53c6317f
TreeHugger Robot [Thu, 4 May 2017 23:11:11 +0000 (23:11 +0000)]
Merge "Stack is visible if behind docked which is behind pinned stack (1/2)" into oc-dev
Ajay Panicker [Thu, 4 May 2017 22:56:16 +0000 (22:56 +0000)]
Merge "Limit btsnoop file size (3/9)" into oc-dev
Makoto Onuki [Thu, 4 May 2017 21:22:17 +0000 (21:22 +0000)]
Merge "Fix frozen alarm issue" into oc-dev
am:
af4bfcdb7e
Change-Id: I2d35bfb3f2afec37ba3e26db4ca77df67ed43a7d
TreeHugger Robot [Thu, 4 May 2017 21:12:35 +0000 (21:12 +0000)]
Merge "Fix frozen alarm issue" into oc-dev
TreeHugger Robot [Thu, 4 May 2017 21:11:25 +0000 (21:11 +0000)]
Merge "Remove redundant dependencies" into oc-dev-plus-aosp
Julia Reynolds [Thu, 4 May 2017 21:06:22 +0000 (21:06 +0000)]
Merge "Do not clear recent intrusive flag if still intrusive" into oc-dev
am:
180f0174ff
Change-Id: Ia13f2ac9ddb54799778c617bed0d98cab4c24cea
Julia Reynolds [Thu, 4 May 2017 21:04:24 +0000 (21:04 +0000)]
Merge "Remove notification settings for deleted users" into oc-dev
am:
c50b731f0f
Change-Id: I73364f24c4f2b77ac5811c094f433f28c1cb4fbe
Julia Reynolds [Thu, 4 May 2017 20:55:45 +0000 (20:55 +0000)]
Merge "Do not clear recent intrusive flag if still intrusive" into oc-dev
Julia Reynolds [Thu, 4 May 2017 20:54:14 +0000 (20:54 +0000)]
Merge "Remove notification settings for deleted users" into oc-dev
Adrian Roos [Thu, 4 May 2017 19:53:24 +0000 (19:53 +0000)]
Merge "AOD: Change DozeTriggersTest to run on prox-less devices" into oc-dev
am:
07672353a5
Change-Id: Ib77d3bbd83724d763e315d8d277e19ca2d0cd7b2
Adrian Roos [Thu, 4 May 2017 19:51:11 +0000 (19:51 +0000)]
Merge "TrustManagerService: Fix service binding leak" into oc-dev
am:
b0ebbc3d2c
Change-Id: Id77bb84e049eacfe8c4a4bbd2c42c5078025811f
Adrian Roos [Thu, 4 May 2017 19:45:34 +0000 (19:45 +0000)]
Merge "AOD: Change DozeTriggersTest to run on prox-less devices" into oc-dev
Adrian Roos [Thu, 4 May 2017 19:44:37 +0000 (19:44 +0000)]
Merge "TrustManagerService: Fix service binding leak" into oc-dev
Android Build Merger (Role) [Thu, 4 May 2017 19:29:58 +0000 (19:29 +0000)]
Merge "Merge "Fix an NPE that can result from a race condition." into oc-dev am:
d8aa2acea3" into oc-dev-plus-aosp
Sundeep Ghuman [Thu, 4 May 2017 19:29:05 +0000 (19:29 +0000)]
Merge "Fix an NPE that can result from a race condition." into oc-dev
am:
d8aa2acea3
Change-Id: I6b167ad55790159769e13b77da1cf43106f1c654
Fyodor Kupolov [Thu, 4 May 2017 19:22:25 +0000 (12:22 -0700)]
Avoid reflection when mocking UserManagerService
Fixed a crash due to a change in the private constructor signature
Test: PackageManagerSettingsTests are passing
Bug:
37989886
Change-Id: I5d46f6018b4bdb369b2e39ad3020235e7f2c5a2e
Sundeep Ghuman [Thu, 4 May 2017 19:25:38 +0000 (19:25 +0000)]
Merge "Fix an NPE that can result from a race condition." into oc-dev
am:
d8aa2acea3
Change-Id: I41bfd05eb74502a034cf1289032ce6a8c50bcbd5
TreeHugger Robot [Thu, 4 May 2017 19:17:57 +0000 (19:17 +0000)]
Merge "Fix an NPE that can result from a race condition." into oc-dev
Yang Ni [Thu, 4 May 2017 19:08:27 +0000 (19:08 +0000)]
Merge "Destroy Allocation with ScriptIntrinsicLut" am:
622b140f94 am:
088eca8302
am:
43dca4780f
Change-Id: Ic180a772a7131e32987364d01581b0333315b798
Yang Ni [Thu, 4 May 2017 19:02:44 +0000 (19:02 +0000)]
Merge "Destroy Allocation with ScriptIntrinsicLut" am:
622b140f94
am:
088eca8302
Change-Id: I9b5cf20890474a8921def39b955863cf7eaade67
Yang Ni [Thu, 4 May 2017 18:56:34 +0000 (18:56 +0000)]
Merge "Destroy Allocation with ScriptIntrinsicLut"
am:
622b140f94
Change-Id: I7d781ce6f36d0205bb35a9b3416e4ea55f4b8eeb
Yang Ni [Thu, 4 May 2017 18:44:28 +0000 (18:44 +0000)]
Merge "Destroy Allocation with ScriptIntrinsicLut"
Yang Ni [Fri, 28 Apr 2017 15:50:33 +0000 (08:50 -0700)]
Destroy Allocation with ScriptIntrinsicLut
Bug:
28053584
On destroying the intrinsic, destroy its contained Allocation right away.
Test: CTS on x86_64 emulator
Change-Id: I5ca0da33b620c3291b7cafda31a6cc83eb7461a0
Jack Yu [Thu, 4 May 2017 18:37:33 +0000 (18:37 +0000)]
Merge "Merge "Moved data retry handler from broadcast to message." am:
19cd7568c6" into stage-aosp-master am:
6904af3684 -s ours
am:
951549ed0f -s ours
Change-Id: Ia185fabdad280d9fd6bcb122f512a50ac27d4476
Android Build Merger (Role) [Thu, 4 May 2017 18:35:11 +0000 (18:35 +0000)]
Merge "Merge "Remove default network recommendation provider." into oc-dev am:
f37f1f199c" into oc-dev-plus-aosp
Joe LaPenna [Thu, 4 May 2017 18:34:14 +0000 (18:34 +0000)]
Merge "Remove default network recommendation provider." into oc-dev
am:
f37f1f199c
Change-Id: I7cc1d9cbc1d22fa6896ebf14d27b06efcac19b23
Jack Yu [Thu, 4 May 2017 18:29:01 +0000 (18:29 +0000)]
Merge "Merge "Moved data retry handler from broadcast to message." am:
19cd7568c6" into stage-aosp-master
am:
6904af3684 -s ours
Change-Id: I5ae05ad2f4e2b4ca749b730f0ef98e70f272980c
Jack Yu [Thu, 4 May 2017 18:28:18 +0000 (18:28 +0000)]
Merge "Moved data retry handler from broadcast to message." am:
19cd7568c6 am:
7e61d2a0de
am:
807e5f4684
Change-Id: Ica3f05b54c3f35cc05a07c9e2a4f29f59787802b
TreeHugger Robot [Thu, 4 May 2017 18:24:52 +0000 (18:24 +0000)]
Merge "Remove default network recommendation provider." into oc-dev
Jack Yu [Thu, 4 May 2017 18:22:09 +0000 (18:22 +0000)]
Merge "Moved data retry handler from broadcast to message." am:
19cd7568c6
am:
7e61d2a0de
Change-Id: I8649b9ed175c6f04f6e1e81a19bd6fb6adb59471
Android Build Merger (Role) [Thu, 4 May 2017 18:20:12 +0000 (18:20 +0000)]
Merge "Merge "Moved data retry handler from broadcast to message." am:
19cd7568c6" into stage-aosp-master
Jack Yu [Thu, 4 May 2017 18:19:09 +0000 (18:19 +0000)]
Merge "Moved data retry handler from broadcast to message."
am:
19cd7568c6
Change-Id: Ie1d413ba04d3efbd159c43dcff9646d0b6f75a35
Jack Yu [Thu, 4 May 2017 18:13:24 +0000 (18:13 +0000)]
Merge "Moved data retry handler from broadcast to message."
am:
19cd7568c6
Change-Id: I8a7c38b4cd6f1307cace357e206a93978e53d4bf
Treehugger Robot [Thu, 4 May 2017 18:04:29 +0000 (18:04 +0000)]
Merge "Moved data retry handler from broadcast to message."
Julia Reynolds [Wed, 3 May 2017 20:00:20 +0000 (16:00 -0400)]
Do not clear recent intrusive flag if still intrusive
Test: manual, post two noisy progress notifications that update
every second. before change, they start swapping after ten seconds.
after change, no swapping.
Fixes:
36299000
Change-Id: Ia16c36660ae6d59b51b7c5b3521ad43de45aa952
Dianne Hackborn [Thu, 4 May 2017 17:37:33 +0000 (17:37 +0000)]
Merge "Fix issue #
37938835: Undismissable "Camera is running in the..." into oc-dev
am:
c45d88b602
Change-Id: I8693b94bf24b53fdba1c2c03667a9ed90ef3931e
Dianne Hackborn [Thu, 4 May 2017 17:28:08 +0000 (17:28 +0000)]
Merge "Fix issue #
37938835: Undismissable "Camera is running in the..." into oc-dev
Brad Ebinger [Thu, 4 May 2017 17:19:34 +0000 (17:19 +0000)]
Merge "Better handle MSIM DDS changed event" into oc-dev
am:
e44125cd3a -s ours
Change-Id: I1033e1b102efcfa30b1d16c3fc8631b8b4cc8017
TreeHugger Robot [Thu, 4 May 2017 17:12:48 +0000 (17:12 +0000)]
Merge "Convert libhwui to Android.bp" into oc-dev-plus-aosp
Brad Ebinger [Thu, 4 May 2017 17:11:46 +0000 (17:11 +0000)]
Merge "Better handle MSIM DDS changed event" into oc-dev
Colin Cross [Wed, 19 Apr 2017 22:25:25 +0000 (15:25 -0700)]
Convert libhwui to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: Ifebdb3797498d49f2bebe5fc728e6d6d8def71cb
Merged-In: Ifebdb3797498d49f2bebe5fc728e6d6d8def71cb
(cherry picked from commit
f6298101181122b5b70d1094b131e44580cf62b2)
Colin Cross [Tue, 2 May 2017 21:14:56 +0000 (14:14 -0700)]
Convert libplatfomprotos to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: I0b45697d1042cb1647f2609b2257444dede84d2a
(cherry picked from commit
aa0d4355d78a94b2c6557983d1fa9aa6c529294c)
Ajay Panicker [Tue, 18 Apr 2017 03:42:22 +0000 (20:42 -0700)]
Limit btsnoop file size (3/9)
Limit btsnoop file size by rotating between snoop files. The rotation occurrs
when a fixed number of packets have been logged and will start overwriting
the older file.
Bug:
35998031
Test: Enable snoop logs from developer options and let logs get large
Change-Id: I40d5da4c1b1c9b45908e5790d130f1c5e804c773
Jack Yu [Wed, 3 May 2017 20:32:30 +0000 (13:32 -0700)]
Moved data retry handler from broadcast to message.
The broadcast handler onReceive implmentations should
only handle minimum works. Made this consistent with
other DcTracker broadcast handler.
Test: Manual tests, Telephony sanity tests, and unit tests
bug:
37413302
Merged-In: I4c65b2f7b8aa5674eb7e131d26e404ec390ed19a
Change-Id: I4c65b2f7b8aa5674eb7e131d26e404ec390ed19a
Amit Mahajan [Thu, 4 May 2017 16:06:07 +0000 (09:06 -0700)]
Use sim language for VZW.
Instead of doing it 204-04 + gid, change has been made for
MCC 204. This can be revisited if there is any 204 carrier for
which sim language is not set correctly.
Test: none; reverting to earlier behavior for these mcc-mncs
Bug:
37704287
Change-Id: I30661e6467bbf5afc3ebb2ae58ddf36df7d55ce6
Winson Chung [Thu, 4 May 2017 16:21:30 +0000 (16:21 +0000)]
Merge "Workaround launching PiP task with CLEAR_TASK & NEW_TASK flag." into oc-dev
am:
c5e289d479
Change-Id: I11edbc227141a31fddef985c7d94cc77ffb6ae80
Winson Chung [Thu, 4 May 2017 16:16:28 +0000 (16:16 +0000)]
Merge "Workaround launching PiP task with CLEAR_TASK & NEW_TASK flag." into oc-dev
Makoto Onuki [Thu, 4 May 2017 15:38:07 +0000 (08:38 -0700)]
Fix frozen alarm issue
Bug
34724174
Test: Manual test with "dumpsys alarm" + putting device into doze
Change-Id: I1d9ec3ac1e78ea263b2598a8c7ab4157ec40c535
Steven Moreland [Wed, 3 May 2017 16:07:00 +0000 (09:07 -0700)]
Remove redundant dependencies
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.
Test: links
Bug:
33276472
Change-Id: Ieac73fb72f543c349f9d6bac7b7951a78fcaf244
(cherry picked from commit
7f71515bbe7f50c0beb1e0f0cac0d222bcb5082a)
Abodunrinwa Toki [Thu, 4 May 2017 15:24:23 +0000 (15:24 +0000)]
Merge "Only classify text when the toolbar is shown." into oc-dev
am:
a20b6ba1f2
Change-Id: I94619c59f052a170c3b40d8de25a5c6f7a71fa85
TreeHugger Robot [Thu, 4 May 2017 15:15:30 +0000 (15:15 +0000)]
Merge "Only classify text when the toolbar is shown." into oc-dev
Neil Fuller [Thu, 4 May 2017 15:12:18 +0000 (15:12 +0000)]
Merge "Time zone update API classes" into oc-dev-plus-aosp
Neil Fuller [Thu, 4 May 2017 14:59:58 +0000 (14:59 +0000)]
Merge "More time zone update API classes" am:
c301339498 am:
9798dc47b1
am:
2cf4771469
Change-Id: Ic82572f406fd56dd11afce108e14ff0dcb45557e
Neil Fuller [Thu, 16 Mar 2017 18:29:36 +0000 (18:29 +0000)]
Time zone update API classes
Time zone update API classes. Currently hidden but they
will go on to be unhidden in future.
This forms the basis of client and system server code to
support time zone updates.
Tests can be run with:
make -j30 FrameworksCoreTests
adb install out/target/product/angler/data/app/FrameworksCoreTests/FrameworksCoreTests.apk
adb shell am instrument -e package android.app.timezone \
-w com.android.frameworks.coretests \
"com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner"
This contains a cherry-pick / conflict resolution of
commit
bede17c216815a849be0c43d5ce7daaf750a9fac after an automerger skip.
(cherry picked from commit
bede17c216815a849be0c43d5ce7daaf750a9fac)
Bug:
31008728
Test: See above.
Merged-In: I668bc8ac0cb78f3d4d9a4b7ad6ac1534b88af833
Change-Id: Icde574f8974152617a1f7ac9fa225bd5011dcce1
Neil Fuller [Thu, 4 May 2017 14:53:53 +0000 (14:53 +0000)]
Merge "More time zone update API classes" am:
c301339498
am:
9798dc47b1
Change-Id: Ia85f1ec883b8ac8cb9a93dfbfabacd1589aafe8f
Neil Fuller [Thu, 4 May 2017 14:48:21 +0000 (14:48 +0000)]
Merge "More time zone update API classes"
am:
c301339498
Change-Id: I23ace2d5102f197ca6d6e22a37b54b43e38753ed
Treehugger Robot [Thu, 4 May 2017 14:41:08 +0000 (14:41 +0000)]
Merge "More time zone update API classes"
Neil Fuller [Thu, 4 May 2017 14:29:30 +0000 (14:29 +0000)]
Merge "Merge "Time zone update API classes" am:
cfe0c2f1ec am:
463f3f8cf7" into nyc-mr2-dev-plus-aosp
am:
5b14a2f0b5
Change-Id: I614964f97c141532560932955fecb5bcd61eb075
Neil Fuller [Thu, 4 May 2017 14:27:28 +0000 (14:27 +0000)]
Merge "Time zone update API classes" am:
cfe0c2f1ec am:
463f3f8cf7
am:
3620392aca -s ours
Change-Id: I2e7c0837ec5f5bc0f93c695ef7cc812305aa6d5c
Android Build Merger (Role) [Thu, 4 May 2017 14:19:36 +0000 (14:19 +0000)]
Merge "Merge "Time zone update API classes" am:
cfe0c2f1ec am:
463f3f8cf7" into nyc-mr2-dev-plus-aosp
Neil Fuller [Thu, 4 May 2017 14:18:53 +0000 (14:18 +0000)]
Merge "Time zone update API classes" am:
cfe0c2f1ec
am:
463f3f8cf7
Change-Id: I633e734b90cb2f4fb12590a15d2fdc634faf7a9c
Geoffrey Pitsch [Thu, 4 May 2017 14:15:51 +0000 (14:15 +0000)]
Merge "Developer setting to show toast for notifications without a channel" into oc-dev
am:
3c0e3d8a36
Change-Id: Ib5f7130e2940365b3868f735fe2f9881a54f0e71
TreeHugger Robot [Thu, 4 May 2017 14:08:58 +0000 (14:08 +0000)]
Merge "Developer setting to show toast for notifications without a channel" into oc-dev
Neil Fuller [Thu, 4 May 2017 14:06:56 +0000 (14:06 +0000)]
Merge "Time zone update API classes" am:
cfe0c2f1ec
am:
463f3f8cf7
Change-Id: I519483f82e12a038e52f3b4813b0db0325749925
Neil Fuller [Thu, 4 May 2017 14:01:23 +0000 (14:01 +0000)]
Merge "Time zone update API classes"
am:
cfe0c2f1ec
Change-Id: I6442aee1844ec9c6ef1017a4744936252ef45243
Neil Fuller [Thu, 4 May 2017 13:51:38 +0000 (13:51 +0000)]
Merge "Time zone update API classes"
Todd Kennedy [Thu, 4 May 2017 13:30:45 +0000 (13:30 +0000)]
Merge "ignore exception calling unlinkToDeath" into oc-dev
am:
79777a5b43
Change-Id: Iaffd850d9422244d92340ac8c5c2346cbb58f39f
TreeHugger Robot [Thu, 4 May 2017 13:23:46 +0000 (13:23 +0000)]
Merge "ignore exception calling unlinkToDeath" into oc-dev
Neil Fuller [Thu, 16 Mar 2017 18:31:56 +0000 (18:31 +0000)]
More time zone update API classes
This class forms the contract between the updater app
(the app provided by and triggered by the system)
and the data app (the app provided by the OEM to
provide time zone data).
Bug:
31008728
Test: make only, just constants
Change-Id: I687b75954e132884aec962fcf8955f3f38a00b2f
Abodunrinwa Toki [Wed, 3 May 2017 19:22:55 +0000 (20:22 +0100)]
Only classify text when the toolbar is shown.
classifyText() is used to generate a menu item in the selection toolbar
to handle the selected text. In this cl we avoid calling classifyText()
when the selection is changing but instead call it when we are about to
show the toolbar.
Previously, we depended on invalidateActionModeAsync() to classify text
after a call to startActionMode(). Now that we've introduced
invalidateActionMode() we need to be able to tell
startSelectionActionMode() that we also want the text to be classified,
hence the introduction of an input parameter, "adjustSelection", to
startSelectionActionModeAysnc().
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Bug:
34966796
Change-Id: I5b9fc9e8ab443f024f8ca461df5a4bcc6485d26b
Android Build Merger (Role) [Thu, 4 May 2017 12:00:06 +0000 (12:00 +0000)]
Merge "Merge "Adjust forced dexopt in case of stripped APKs." am:
5669550a83 am:
f59dd816b1 am:
8d76994c5b" into oc-dev-plus-aosp
Nicolas Geoffray [Thu, 4 May 2017 11:59:12 +0000 (11:59 +0000)]
Merge "Adjust forced dexopt in case of stripped APKs." am:
5669550a83 am:
f59dd816b1
am:
8d76994c5b
Change-Id: I11871e75179ec64bd30fe23d6bcb40765ce6c64b
Nicolas Geoffray [Thu, 4 May 2017 11:53:58 +0000 (11:53 +0000)]
Merge "Adjust forced dexopt in case of stripped APKs." am:
5669550a83 am:
f59dd816b1
am:
8d76994c5b
Change-Id: I87acb3200de0e731eab78107d30c3c8999674c6d
Android Build Merger (Role) [Thu, 4 May 2017 11:46:16 +0000 (11:46 +0000)]
Merge "Merge "Handle volume keys to apps in Vr mode" into oc-dev am:
a58589bdc1" into oc-dev-plus-aosp
Nicolas Geoffray [Thu, 4 May 2017 11:42:13 +0000 (11:42 +0000)]
Merge "Adjust forced dexopt in case of stripped APKs." am:
5669550a83
am:
f59dd816b1
Change-Id: If41af16abab0e193fcfef6a939f039a4f24a38ef
Karthik Ravi Shankar [Thu, 4 May 2017 11:42:03 +0000 (11:42 +0000)]
Merge "Handle volume keys to apps in Vr mode" into oc-dev
am:
a58589bdc1
Change-Id: Ib4ef4f2e70fe86970c7d1224466dc75cc8883f7f
Karthik Ravi Shankar [Thu, 4 May 2017 11:38:26 +0000 (11:38 +0000)]
Merge "Handle volume keys to apps in Vr mode" into oc-dev
am:
a58589bdc1
Change-Id: I05992bb4a0f3ac1343bf55a9c33297542ff45424
Nicolas Geoffray [Thu, 4 May 2017 11:34:06 +0000 (11:34 +0000)]
Merge "Adjust forced dexopt in case of stripped APKs."
am:
5669550a83
Change-Id: I1ca14c8eee35cb3f793b2a004f5bd6f6b8ca6120
Neil Fuller [Thu, 16 Mar 2017 18:29:36 +0000 (18:29 +0000)]
Time zone update API classes
Time zone update API classes. Currently hidden but they
will go on to be unhidden in future.
This forms the basis of client and system server code to
support time zone updates.
Tests can be run with:
make -j30 FrameworksCoreTests
adb install out/target/product/angler/data/app/FrameworksCoreTests/FrameworksCoreTests.apk
adb shell am instrument -e package android.app.timezone \
-w com.android.frameworks.coretests \
"com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner"
Bug:
31008728
Test: See above.
Merged-In: I668bc8ac0cb78f3d4d9a4b7ad6ac1534b88af833
Change-Id: Icde574f8974152617a1f7ac9fa225bd5011dcce1
TreeHugger Robot [Thu, 4 May 2017 11:26:53 +0000 (11:26 +0000)]
Merge "Handle volume keys to apps in Vr mode" into oc-dev
Nicolas Geoffray [Thu, 4 May 2017 11:25:03 +0000 (11:25 +0000)]
Merge "Adjust forced dexopt in case of stripped APKs."
Nicolas Geoffray [Wed, 3 May 2017 10:51:53 +0000 (11:51 +0100)]
Adjust forced dexopt in case of stripped APKs.
We cannot compile from scratch for strip APK. So
if getDexOptNeeded returns NotNeeded, pretend there was
a compiler filter change, in order to pick up the vdex file.
bug:
37558732
Test: "adb shell cmd package compile" of a stripped /system apk
Change-Id: I531010e01e44adfa300872c1739c49dab7292317
Tony Mak [Thu, 4 May 2017 08:50:01 +0000 (08:50 +0000)]
Merge "selectBackupTransportAsync should report failure when backup is not available" into oc-dev
am:
9dee975361
Change-Id: I174fa48341337fa38e1edf40460f01a655fff62a
TreeHugger Robot [Thu, 4 May 2017 08:43:59 +0000 (08:43 +0000)]
Merge "selectBackupTransportAsync should report failure when backup is not available" into oc-dev
Matthew Ng [Thu, 4 May 2017 06:40:45 +0000 (06:40 +0000)]
Merge "Reset touch location after touch slop is exceeded in recents" into oc-dev
am:
02862f31f8
Change-Id: Ided4114855fa866fca637f8171ea7030e347f485
TreeHugger Robot [Thu, 4 May 2017 06:35:48 +0000 (06:35 +0000)]
Merge "Reset touch location after touch slop is exceeded in recents" into oc-dev
Christopher Tate [Thu, 4 May 2017 06:32:49 +0000 (06:32 +0000)]
Merge "Allow TIMEZONE_CHANGED to launch apps" into oc-dev
am:
b84b8bd40d
Change-Id: I7fe49ac402da96a8279212ba3e35442c26075cbd
TreeHugger Robot [Thu, 4 May 2017 06:27:29 +0000 (06:27 +0000)]
Merge "Allow TIMEZONE_CHANGED to launch apps" into oc-dev
Sundeep Ghuman [Wed, 3 May 2017 19:45:44 +0000 (12:45 -0700)]
Fix an NPE that can result from a race condition.
NetworkInfo and WifiInfo are set via broadcast receiver so while in a
true stable state network info should not be null if wifi info is, this
can occur in rare instances due to a race condition. It is convention in
AccessPoint.java to always null check network info.
Bug: b/
37951301
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: Ia1b357c84b961a555ec24a5b930ade35ddf8dbba
Karthik Ravi Shankar [Thu, 4 May 2017 05:23:42 +0000 (05:23 +0000)]
Merge "Rename CompatibilityDisplay to Vr2dDisplay" into oc-dev
am:
1d01f9cf67
Change-Id: I4072d3d1ccd258473ccc35412dd3b002e0239f2d
OSDN Git Service
