OSDN Git Service
Andreas Gampe [Tue, 21 Mar 2017 19:17:16 +0000 (12:17 -0700)]
resolve merge conflicts of
9034b2717c88 to master
Change-Id: Ifcc9fdbf8581e81a61f7a279c2b7d3177e972596
Jakub Pawlowski [Tue, 21 Mar 2017 18:59:57 +0000 (18:59 +0000)]
Merge "Add setScannable to AdvertisingSetParameters (1/2)" am:
7f14b8f095 am:
8d06b41826
am:
34d23b7794
Change-Id: I960254d1c051f58c882a6c39bb6fb2173a47c0ef
Jakub Pawlowski [Tue, 21 Mar 2017 18:58:31 +0000 (18:58 +0000)]
Merge "Add missing txPower parameter" am:
a6c1f6def1 am:
43f71975d0
am:
ac5adba90e
Change-Id: I0f7b282fb1a0d09742f8a8e9aca5a62b841adf0a
Andreas Gampe [Tue, 21 Mar 2017 18:58:27 +0000 (18:58 +0000)]
Merge "Zygote: Preserve capabilities in WrapperInit" am:
1ae7af10ff
am:
1d9c3ba10d
Change-Id: Ia9b6111705486d7da69ef2436d03cd19272502b6
Andreas Gampe [Tue, 21 Mar 2017 18:54:22 +0000 (18:54 +0000)]
Merge "Zygote: Preserve capabilities in WrapperInit"
am:
1ae7af10ff
Change-Id: Ia1ffb03d6e03b098cc634ef2deb3785c6bb87202
Jakub Pawlowski [Tue, 21 Mar 2017 18:52:03 +0000 (18:52 +0000)]
Merge "Add setScannable to AdvertisingSetParameters (1/2)" am:
7f14b8f095
am:
8d06b41826
Change-Id: I8cc220bd494841841f89eeba840ce71b1c2a0692
Jakub Pawlowski [Tue, 21 Mar 2017 18:50:51 +0000 (18:50 +0000)]
Merge "Add missing txPower parameter" am:
a6c1f6def1
am:
43f71975d0
Change-Id: If6dbc369985eaf18db9c8fd0670683768d613406
Andreas Gampe [Tue, 21 Mar 2017 18:45:00 +0000 (18:45 +0000)]
Merge "Zygote: Preserve capabilities in WrapperInit"
Jakub Pawlowski [Tue, 21 Mar 2017 18:44:36 +0000 (18:44 +0000)]
Merge "Add setScannable to AdvertisingSetParameters (1/2)"
am:
7f14b8f095
Change-Id: I26846383be5c0fe88501ffd1011b27f39896a74a
Jakub Pawlowski [Tue, 21 Mar 2017 18:43:21 +0000 (18:43 +0000)]
Merge "Add missing txPower parameter"
am:
a6c1f6def1
Change-Id: I61ac50f7f2a5d3d3ea2a3e23b441fa22bb69f52a
Jakub Pawlowski [Tue, 21 Mar 2017 18:37:34 +0000 (18:37 +0000)]
Merge "Add setScannable to AdvertisingSetParameters (1/2)"
Jakub Pawlowski [Mon, 20 Mar 2017 22:57:46 +0000 (15:57 -0700)]
Add setScannable to AdvertisingSetParameters (1/2)
There must be a proper way to specify if advertisment is scannable, when
updating the parameters.
Test: manual
Bug:
30622771
Change-Id: Ie520609d3fff07ccc2960015c19311d773842852
Jakub Pawlowski [Tue, 21 Mar 2017 18:36:14 +0000 (18:36 +0000)]
Merge "Add missing txPower parameter"
Jakub Pawlowski [Tue, 21 Mar 2017 00:02:20 +0000 (17:02 -0700)]
Add missing txPower parameter
Test: manual
Bug:
30622771
Change-Id: Iaf3111d7545f9bb046b5a23b680347a75125ca7e
Joachim Sauer [Tue, 21 Mar 2017 18:32:27 +0000 (18:32 +0000)]
Merge "Update to 2017a." am:
2ca0abc8de am:
eeca6add23
am:
2fc77f78f5
Change-Id: I52889a24c3a81875d6e26897034634677836e426
Joachim Sauer [Tue, 21 Mar 2017 18:28:16 +0000 (18:28 +0000)]
Merge "Update to 2017a." am:
2ca0abc8de
am:
eeca6add23
Change-Id: I7dd23af7452ed9836fb26dad0d7774ce9aef1c36
Joachim Sauer [Tue, 21 Mar 2017 18:22:44 +0000 (18:22 +0000)]
Merge "Update to 2017a."
am:
2ca0abc8de
Change-Id: I0a6dd7f5cef6f7f3634413d012c8f1c84c807aac
TreeHugger Robot [Tue, 21 Mar 2017 18:09:58 +0000 (18:09 +0000)]
Merge "Fix QS/status bar BT state"
Treehugger Robot [Tue, 21 Mar 2017 18:09:33 +0000 (18:09 +0000)]
Merge "Update to 2017a."
TreeHugger Robot [Tue, 21 Mar 2017 17:58:44 +0000 (17:58 +0000)]
Merge "Exfiltrate cert code from DevicePolicyManager"
Calin Juravle [Tue, 21 Mar 2017 17:51:33 +0000 (17:51 +0000)]
Merge "Clean up logs in DexManager"
TreeHugger Robot [Tue, 21 Mar 2017 17:49:02 +0000 (17:49 +0000)]
Merge "Allocate new UID for OTA update resource tracking."
TreeHugger Robot [Tue, 21 Mar 2017 17:35:44 +0000 (17:35 +0000)]
Merge "Remove leftover DO/PO check in isPackageSuspended"
TreeHugger Robot [Tue, 21 Mar 2017 17:07:37 +0000 (17:07 +0000)]
Merge "Update SkiaPipelineTests.cpp to use new onNewImageSnapshot signature Test: code compiles & test continues to succeed"
TreeHugger Robot [Tue, 21 Mar 2017 17:01:28 +0000 (17:01 +0000)]
Merge "Request logs from logd with 3s overlap to avoid missing events."
Casey Burkhardt [Tue, 21 Mar 2017 16:40:01 +0000 (16:40 +0000)]
Merge "Fix NPE in NavigationBarFragment"
TreeHugger Robot [Tue, 21 Mar 2017 16:16:58 +0000 (16:16 +0000)]
Merge "[Resources] preloaded drawables few"
Brian Carlstrom [Tue, 21 Mar 2017 16:11:51 +0000 (16:11 +0000)]
Merge "Improvements to ActivityManagerService stack dumping"
Jeff Sharkey [Tue, 21 Mar 2017 16:09:50 +0000 (10:09 -0600)]
Allocate new UID for OTA update resource tracking.
Recent changes to OTA updates started "blaming" network usage on the
system UID, which makes it difficult to triage incoming bugreports
that claim heavy network usage. Instead, this change gives OTA
updates an explicit UID to make triage easier.
Test: builds, boots
Bug:
36130264
Change-Id: I541299f83def41cfebc010dd825093467f372e79
Jorim Jaggi [Tue, 21 Mar 2017 15:53:48 +0000 (15:53 +0000)]
Merge changes I7f7a9842,I4c74b269
* changes:
Implement new thumbnail loading strategy
Also store reduced resolution screenshots
Andreas Gampe [Mon, 13 Mar 2017 21:36:09 +0000 (14:36 -0700)]
Zygote: Preserve capabilities in WrapperInit
Preserve the capabilities a zygote fork has across the sh exec in
WrapperInit. Use ambient capabilities.
Test: m
Test: adb shell setprop wrap.com.android.bluetooth logwrapper && adb shell kill `pid com.android.bluetooth`
Merged-In: I3526d6a31aaadf082365c9ce31da0950e17677eb
Change-Id: I3526d6a31aaadf082365c9ce31da0950e17677eb
Robert Phillips [Mon, 20 Mar 2017 17:44:46 +0000 (13:44 -0400)]
Update SkiaPipelineTests.cpp to use new onNewImageSnapshot signature
Test: code compiles & test continues to succeed
https://skia-review.googlesource.com/c/9882/ (Remove budgeted parameter
from SkSurface::makeImageSnapshot (take 2)) seems to have stuck so this
should be safe to land.
Change-Id: I9e6fdcc8debe7964e9522f7acd8829b54bc90986
Pavel Grafov [Sat, 25 Feb 2017 19:45:43 +0000 (19:45 +0000)]
Request logs from logd with 3s overlap to avoid missing events.
Example: If we got a batch with timestamps [1, 4, 8] and an event
with timestamp 7 was delayed and was added to the buffer later,
if we request the next batch starting from timestamp 8 or 9 that
event will be lost.
The last 3 seconds of events are kept and checked against the next
batch.
Test: afw-test-tradefed-ci run afw-do-security-logging
Change-Id: I55727cfc6143c172edc7dabfd995776f9a0f7eab
Bug:
35373582
Bug:
35026180
Bug:
35648675
Bryce Lee [Tue, 21 Mar 2017 14:33:21 +0000 (14:33 +0000)]
Merge "Do not remove the default display during tests."
Geoffrey Pitsch [Tue, 21 Mar 2017 14:12:17 +0000 (14:12 +0000)]
Merge "Delete the Default Channel when an app starts using channels."
Jorim Jaggi [Fri, 17 Mar 2017 16:22:47 +0000 (17:22 +0100)]
Implement new thumbnail loading strategy
- By default, we load only the reduced resolution screenshots.
- As soon as the user stops scrolling fast, we also start loading
full resolution screenshots.
- We prefetch reduced resolution screenshots when scrolling from
back to front, as the other direction is automatically prefetched
because the thumbnails aren't immediately visible.
Test: Open many apps, adb restart, scroll fast and slow in recents
Test: runtest systemui -c com.android.systemui.recents.model.HighResThumbnailLoaderTest
Bug:
34829962
Change-Id: I7f7a9842eb28a09a18573426fa9677cee2877124
Jorim Jaggi [Fri, 17 Mar 2017 16:06:50 +0000 (17:06 +0100)]
Also store reduced resolution screenshots
In order to speed up loading time when scrolling through it
in recents. They will be used in recents in the next CL. Also, we
use JPG instead as loading JPG is much faster than PNG.
Test: TaskSnapshotPersisterLoaderTest
Test: TaskSnapshotCacheTest
Bug:
34829962
Change-Id: I4c74b26969ae459bd3b1a42707011a49f425abd9
TreeHugger Robot [Tue, 21 Mar 2017 13:55:25 +0000 (13:55 +0000)]
Merge "Fix build following change
0763650"
TreeHugger Robot [Tue, 21 Mar 2017 13:40:31 +0000 (13:40 +0000)]
Merge "BZZZZZZT! BZZZZZT! New Vibrator APIs"
TreeHugger Robot [Tue, 21 Mar 2017 13:29:16 +0000 (13:29 +0000)]
Merge "Modify VectorDrawable to scale path through canvas matrix"
TreeHugger Robot [Tue, 21 Mar 2017 13:25:19 +0000 (13:25 +0000)]
Merge "Do not allow WebView instantiation from privileged processes."
Joachim Sauer [Tue, 21 Mar 2017 12:39:26 +0000 (12:39 +0000)]
Update to 2017a.
This commit adds America/Punta_Arenas to time_zones_by_country.xml to
allow it to automatically be picked based on cell network information.
Bug:
35861784
Test: builds & boots & automatic timezone detection still works
Change-Id: I1bfa327fbb58f82eb951028e288fad819bf0f231
Diego Perez [Tue, 21 Mar 2017 11:47:47 +0000 (11:47 +0000)]
Fix build following change
0763650
Test: N/A
Change-Id: Ie376cb34f0a6ea1f33fab3871abb9db43c5fcf62
Edman Anjos [Mon, 20 Mar 2017 18:40:22 +0000 (19:40 +0100)]
Remove leftover DO/PO check in isPackageSuspended
We already check if the caller is a DO, PO, or a delegate in
enforceCanManageScope, the additional call to
getActiveAdminForCallerLocked makes this function inaccessible to
delegate applications and was removed.
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.MixedDeviceOwnerTest#testDelegation
Change-Id: I5df0f19a017a3b6e130329940c79b12cbb95ec9e
Erik Kline [Tue, 21 Mar 2017 10:29:58 +0000 (10:29 +0000)]
Merge "add and incorporate TetheringConfiguration.dump()" am:
9eb959320f am:
9e46faff07
am:
d9f71bcf6d
Change-Id: I6b2a5aa4054fc0a2a465b940aea11194d3bc39a8
Erik Kline [Tue, 21 Mar 2017 10:22:21 +0000 (10:22 +0000)]
Merge "add and incorporate TetheringConfiguration.dump()" am:
9eb959320f
am:
9e46faff07
Change-Id: I227d8bcd27ae2970ee65d6cc83faa37ff4e4f17a
Erik Kline [Tue, 21 Mar 2017 10:14:19 +0000 (10:14 +0000)]
Merge "add and incorporate TetheringConfiguration.dump()"
am:
9eb959320f
Change-Id: I29c80b36ddd14e1e03c88c63d35ee9982dcef887
Treehugger Robot [Tue, 21 Mar 2017 10:05:41 +0000 (10:05 +0000)]
Merge "add and incorporate TetheringConfiguration.dump()"
Jack Yu [Tue, 21 Mar 2017 09:32:53 +0000 (09:32 +0000)]
Merge "Added ETWS primary message default message support" am:
2d3fb48b39 am:
dfe1743b37
am:
0f127ea929 -s ours
Change-Id: I8eef7fc8f253a647469b71328eb6d89a0210f6ff
Jack Yu [Tue, 21 Mar 2017 09:26:51 +0000 (09:26 +0000)]
Merge "Added ETWS primary message default message support" am:
2d3fb48b39
am:
dfe1743b37
Change-Id: I71a1be66cb84ed8030df4ab9d406c390872f5346
Jack Yu [Tue, 21 Mar 2017 09:20:17 +0000 (09:20 +0000)]
Merge "Added ETWS primary message default message support"
am:
2d3fb48b39
Change-Id: Ib03378e2f9c2da53b5efbedde08b20acc0b8c199
TreeHugger Robot [Tue, 21 Mar 2017 09:16:11 +0000 (09:16 +0000)]
Merge "Update AMS to wait for network state update if requested by the main thread."
Treehugger Robot [Tue, 21 Mar 2017 09:11:44 +0000 (09:11 +0000)]
Merge "Added ETWS primary message default message support"
TreeHugger Robot [Tue, 21 Mar 2017 07:55:54 +0000 (07:55 +0000)]
Merge "Fix an argument passing to putStorageDocuments."
Jack Yu [Sat, 18 Mar 2017 06:21:48 +0000 (23:21 -0700)]
Added ETWS primary message default message support
ETWS primary message does not contain messagy body. We used
to use hardcoded "ETWS" as the body, which is not easy for
end users to understand what happened. Added the built-in
default messages provided by Japanese government guideline
for earthquake, Tsunami, test, and other channels support to
enhance the user experience.
Test: manual
bug:
33595007
Merged-In: I53659298d8ce3b3ba5c751c14c1b36e76d6dc562
Change-Id: I53659298d8ce3b3ba5c751c14c1b36e76d6dc562
Jack Yu [Tue, 21 Mar 2017 07:38:20 +0000 (07:38 +0000)]
Merge "Added ETWS primary message default message support"
Sudheer Shanka [Thu, 9 Mar 2017 02:19:01 +0000 (18:19 -0800)]
Update AMS to wait for network state update if requested by the main thread.
Bug:
27803922
Test: runtest -c com.android.server.am.ActivityManagerServiceTest frameworks-services
runtest -c com.android.server.am.ActivityManagerInternalTest frameworks-services
cts-tradefed run singleCommand cts-dev --module CtsHostsideNetworkTests
and manual
Change-Id: I7d1052b9941c1fae51ff8ab1c9b89dca3919ccd2
Calin Juravle [Tue, 21 Mar 2017 06:46:44 +0000 (23:46 -0700)]
Clean up logs in DexManager
The log notifying that the dex path does not exists for the user was not
accurate. Also, the symlink debug check was misplaced.
Test: runtest -x .../DexManagerTests.java
Bug:
32871170
Change-Id: I1e90034da47d71a11efb307df2307951572011ee
Sudheer Shanka [Tue, 21 Mar 2017 06:31:15 +0000 (06:31 +0000)]
Merge "Add lastProcStateSeqDispatchedToObservers to UidRecord."
TreeHugger Robot [Tue, 21 Mar 2017 06:29:13 +0000 (06:29 +0000)]
Merge "SurfaceView: Fix some log spam."
Sudheer Shanka [Tue, 7 Mar 2017 23:38:01 +0000 (15:38 -0800)]
Add lastProcStateSeqDispatchedToObservers to UidRecord.
This will help in identifying the last procStateSeq for which AMS
notified NPMS about the process state change.
Bug:
27803922
Test: runtest -c com.android.server.am.ActivityManagerServiceTest frameworks-services
Change-Id: I741a8ffe31de92070f3ebbc9c4f95fc1c0a340cd
TreeHugger Robot [Tue, 21 Mar 2017 06:14:54 +0000 (06:14 +0000)]
Merge "Fix NPE when mDecor is null on ActivityClientRecord"
Sudheer Shanka [Tue, 21 Mar 2017 06:12:58 +0000 (06:12 +0000)]
Merge "Update NPMS to notify AMS when network policy rules are updated."
Jack Yu [Sat, 18 Mar 2017 06:21:48 +0000 (23:21 -0700)]
Added ETWS primary message default message support
ETWS primary message does not contain messagy body. We used
to use hardcoded "ETWS" as the body, which is not easy for
end users to understand what happened. Added the built-in
default messages provided by Japanese government guideline
for earthquake, Tsunami, test, and other channels support to
enhance the user experience.
Test: manual
bug:
33595007
Change-Id: I53659298d8ce3b3ba5c751c14c1b36e76d6dc562
Guang Zhu [Tue, 21 Mar 2017 05:09:21 +0000 (05:09 +0000)]
Merge "Revert "AAPT: Version <adaptive-icon> to v26""
Robert Carr [Tue, 21 Mar 2017 04:47:11 +0000 (21:47 -0700)]
SurfaceView: Fix some log spam.
We were throwing relatively harmless NPEs here
and catching them below. The log message when
catching exceptions also needed some updating.
Not assosciated with a particular bug just
noticed in logcat.
Test: Manual
Change-Id: I5f07e6fc8ff3a34318682bf7b6c309fbba4097e4
TreeHugger Robot [Tue, 21 Mar 2017 04:22:34 +0000 (04:22 +0000)]
Merge "Connectivity metrics: add transports to validation probes"
Adam Lesinski [Tue, 21 Mar 2017 03:54:10 +0000 (03:54 +0000)]
Merge changes I8c710af6,Iedf30212
* changes:
libandroidfw: Fix mass logspam of ResourceTypes warnings
NativeActivity JNI: Retain VM reference to AssetManager
Guang Zhu [Tue, 21 Mar 2017 03:53:43 +0000 (03:53 +0000)]
Revert "AAPT: Version <adaptive-icon> to v26"
Bug:
36462965
Bug:
35908647
This reverts commit
c7614e5d1e8f9139cccf6ab9b78dda16b98f7656.
Change-Id: I25279e7c53823dad0703c7e2ea8ff91bdbc1a0f2
Keun-young Park [Tue, 21 Mar 2017 03:50:40 +0000 (03:50 +0000)]
Merge "log last fs shutdown time / stat before reboot"
TreeHugger Robot [Tue, 21 Mar 2017 03:15:10 +0000 (03:15 +0000)]
Merge "Change string for connected via WFA."
TreeHugger Robot [Tue, 21 Mar 2017 02:59:16 +0000 (02:59 +0000)]
Merge changes I8bfabcb1,I563a6a31
* changes:
Connectivity metrics: change how interface names are logged
Connectivity metrics: serialize networkId, transports, ifname
Hugo Benichi [Fri, 17 Mar 2017 06:42:40 +0000 (15:42 +0900)]
Connectivity metrics: add transports to validation probes
This patch adds transports info to ValidationProbeEvent and migrates
netId logging for this event to the topt-level netId field in
ConnectivityMetricsEvent.
Test: modified unit tests. $ runtest frameworks-net passes
Bug:
3490169
Change-Id: Ibf51049ba8901ae5ca4ea86e2f500944a4738b5c
Stephen Chen [Mon, 20 Mar 2017 20:27:51 +0000 (13:27 -0700)]
Change string for connected via WFA.
Bug:
34773168
Test: runtest
Change-Id: I292013c874012cca004be1078f854cb3ee145112
Hugo Benichi [Thu, 16 Mar 2017 07:33:47 +0000 (16:33 +0900)]
Connectivity metrics: change how interface names are logged
This patch deprecates the ifname field for specific metrics events of
types DhcpClientEvent, DhcpErrorEvent, IpReachabilityEvent and
IpManagerEvent.
Instead ifnames are logged in ConnectivityMetricsEvent, allowing for
link layer inference.
Test: updated unit tests, $ runtest frameworks-net passes
Bug:
34901696
Change-Id: I8bfabcb115bbd5289471d653c153a40bb48f28cd
Hugo Benichi [Wed, 15 Mar 2017 14:05:01 +0000 (23:05 +0900)]
Connectivity metrics: serialize networkId, transports, ifname
This patch adds translation from ConnectivityMetricsEvent to
IpConnectivityEvent of recently added fields:
- top-level network id
- top-level ifname
- transports
Also adds inference of link layer from transports or ifname.
At the moment these new fields are not populated in
ConnectivityMetricsEvent. Follow-up patches will fill this gap for
the events of the android.net.metrics package.
Test: new unit tests, $ runtest frameworks-net passes
Bug:
34901696
Change-Id: I563a6a3183470bdfaabb7c781a1beaf6b1058bf0
Adam Lesinski [Tue, 21 Mar 2017 01:03:14 +0000 (01:03 +0000)]
Merge "AssetManager: Guard against null in array retrieval"
Daichi Hirono [Tue, 21 Mar 2017 00:55:07 +0000 (09:55 +0900)]
Fix an argument passing to putStorageDocuments.
Previously device.eventSupported was wrongly passed to
putStorageDocuments while we need to pass device.operationSupported.
Bug:
35855598
Test: manually copied a file from phone to phone
Change-Id: Iaa5d8973b3af0a157ed3196fb83971aeb148d203
Pankaj Kanwar [Tue, 21 Mar 2017 00:45:50 +0000 (00:45 +0000)]
Merge "Updated javadocs for sendUssd APIs."
Keun-young Park [Thu, 16 Mar 2017 00:05:15 +0000 (17:05 -0700)]
log last fs shutdown time / stat before reboot
- init will record shutdown time spent in file system part
to kernel log, and it is avaiable as last_kmsg after reboot.
- Find it from last_kmsg and log it.
bug:
36004738
Test: reboot / cold boot and check logs
Change-Id: Ic5795b327eec482895ac79b39be2a246c6997999
Sudheer Shanka [Tue, 7 Mar 2017 19:51:46 +0000 (11:51 -0800)]
Update NPMS to notify AMS when network policy rules are updated.
Bug:
27803922
Test: runtest -c com.android.server.am.ActivityManagerInternalTest frameworks-services
runtest -c com.android.server.NetworkPolicyManagerServiceTest frameworks-services
Change-Id: I357fd5c80b7e6d3e63df95397e328c52f233958b
Winson Chung [Tue, 21 Mar 2017 00:28:57 +0000 (00:28 +0000)]
Merge "Update PiP AppOps flag to enforce all PiP functionality."
Winson Chung [Tue, 21 Mar 2017 00:28:57 +0000 (00:28 +0000)]
Merge "Showing notification when activity is in PiP."
Jin Qian [Tue, 21 Mar 2017 00:19:26 +0000 (00:19 +0000)]
Merge "Revert "Add remote callbacks for persistent vr mode""
Kevin Hufnagle [Tue, 21 Mar 2017 00:16:01 +0000 (00:16 +0000)]
Merge changes Ie70977f9,I45ef3001
* changes:
2-way cherry-pick from oc-preview-docs-release: docs: Updated ShortcutManager Javadoc for Android O Developer Preview.
docs: Edited ShortcutManager reference docs for Android O.
Adam Lesinski [Tue, 21 Mar 2017 00:15:25 +0000 (00:15 +0000)]
Merge "AAPT: Version <adaptive-icon> to v26"
Jeremy Klein [Tue, 21 Mar 2017 00:10:46 +0000 (00:10 +0000)]
Merge "In isTetheringSupported, call isAdmin user from system." am:
4a8953094f am:
23d6ba12f1
am:
0b8756e735
Change-Id: I76d02e97382c0332e3d93383d60e8e7fc9951a08
Jin Qian [Tue, 21 Mar 2017 00:04:53 +0000 (00:04 +0000)]
Revert "Add remote callbacks for persistent vr mode"
This reverts commit
504c6d67d0c2e4cda5201372551914f94acce710.
Change-Id: Ia0f8d508272211736d421cf097abaa0bcbc3abab
TreeHugger Robot [Tue, 21 Mar 2017 00:04:22 +0000 (00:04 +0000)]
Merge "Fine-grained systrace for NetworkPolicyManagerService"
Jeremy Klein [Tue, 21 Mar 2017 00:04:11 +0000 (00:04 +0000)]
Merge "In isTetheringSupported, call isAdmin user from system." am:
4a8953094f
am:
23d6ba12f1
Change-Id: I35f45927c564773c10da78e1476814f0a1c7f1be
Jeremy Klein [Mon, 20 Mar 2017 23:58:09 +0000 (23:58 +0000)]
Merge "In isTetheringSupported, call isAdmin user from system."
am:
4a8953094f
Change-Id: Ibefe655ed377c55322d871e02d87c0d001327da8
Jeremy Klein [Mon, 20 Mar 2017 23:50:57 +0000 (23:50 +0000)]
Merge "In isTetheringSupported, call isAdmin user from system."
Casey Burkhardt [Mon, 20 Mar 2017 22:10:16 +0000 (15:10 -0700)]
Fix NPE in NavigationBarFragment
Retains handle to a ContentResolver within NavigationBarFragment
to account for Context sometimes being unavailable.
Bug:
36356742
Change-Id: Id9070276feb77126e4d0358b8db91516f27ace47
Test: Manual
Stephen Kiazyk [Mon, 20 Mar 2017 23:23:45 +0000 (16:23 -0700)]
Fix NPE when mDecor is null on ActivityClientRecord
It seems like this case is handled in all other instances that mDecor is
accessed, so I can only assume that this should also check for null.
Bug:
36396248
Test: Compile and run VR application, crash no longer observed.
Change-Id: I53559bd6f1b9e14f93b8f3881ba5b52b45289f65
Steven Thomas [Mon, 20 Mar 2017 23:43:46 +0000 (23:43 +0000)]
Merge "Add remote callbacks for persistent vr mode"
Eugene Susla [Mon, 20 Mar 2017 23:04:11 +0000 (23:04 +0000)]
Merge "Register PackageMonitor for CompanionDeviceManagerService"
TreeHugger Robot [Mon, 20 Mar 2017 22:56:18 +0000 (22:56 +0000)]
Merge "Ensure that we update the controller before setting menu visibility."
Jakub Pawlowski [Mon, 20 Mar 2017 22:41:06 +0000 (22:41 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (1/4)" am:
f0c963a5b6 am:
375741e99a
am:
d7714c45e0
Change-Id: I71d5455248a9840aadf02859ba8652bd80eca559
TreeHugger Robot [Mon, 20 Mar 2017 22:37:20 +0000 (22:37 +0000)]
Merge "More RecoverableSecurityException docs."
TreeHugger Robot [Mon, 20 Mar 2017 22:35:36 +0000 (22:35 +0000)]
Merge "Allow setting a persistent VR thread."