OSDN Git Service
TreeHugger Robot [Wed, 24 Jan 2018 16:49:15 +0000 (16:49 +0000)]
Merge "Simplify the memory metrics atoms."
TreeHugger Robot [Wed, 24 Jan 2018 16:44:40 +0000 (16:44 +0000)]
Merge "Do not output empty metric reports."
Peter Visontay [Wed, 18 Oct 2017 17:40:23 +0000 (18:40 +0100)]
Log the CHANGE_WIFI_STATE App Op in WifiManager (client changes).
Test: Manually tested that the op is noted. Ran opt/net/wifi/tests/wifitests/runtests.sh and base/wifi/tests/runtests.sh. Manually tested that 'idle' mode is now handled correctly.
Bug:
63907873
Change-Id: I66b20cdaab0f93700cc3fb871ae888ae0a9be32b
TreeHugger Robot [Wed, 24 Jan 2018 16:23:45 +0000 (16:23 +0000)]
Merge "MediaSession2: Define setAudioAttributes / setAudioFocusRequest"
TreeHugger Robot [Wed, 24 Jan 2018 15:57:44 +0000 (15:57 +0000)]
Merge "Revert "Use ImageDecoder for BitmapDrawable""
TreeHugger Robot [Wed, 24 Jan 2018 15:45:08 +0000 (15:45 +0000)]
Merge "Initial implmentation of AnimatedImageDrawables on the RenderThread."
Tony Mak [Wed, 24 Jan 2018 15:31:34 +0000 (15:31 +0000)]
Merge "Swap the order of realCallingUid and realCallingPid in startActivityInPackage"
Jorim Jaggi [Wed, 24 Jan 2018 15:29:59 +0000 (15:29 +0000)]
Merge "Fixed the case where the task was moved to the front"
Julia Reynolds [Tue, 23 Jan 2018 18:55:18 +0000 (13:55 -0500)]
Output chooser layout updates
- Anchor output chooser to volume buttons
- Dismiss output chooser if volume dialog becomes visible
Test: manual, runtest systemui
Fixes:
72319160
Bug:
63096355
Change-Id: Ibca7576f287655fb5c98554e67781ec53152ddef
Julia Reynolds [Tue, 23 Jan 2018 17:37:56 +0000 (12:37 -0500)]
Volume layout updates
- Add shadow
- make the sliders to LTR in landscape
- make all sliders horizontal in landscape
- stack volume rows in landscape
Test: manual
Bug:
63096355
Change-Id: I5452aa3b962727982d5fc103313518e9cbf2750e
Fixes:
72303358
Fixes:
72260231
Fixes:
72260096
TreeHugger Robot [Wed, 24 Jan 2018 15:18:24 +0000 (15:18 +0000)]
Merge "Display smart replies in notifications"
Tony Mak [Wed, 24 Jan 2018 15:11:06 +0000 (15:11 +0000)]
Swap the order of realCallingUid and realCallingPid in startActivityInPackage
Checked ag/
3483468, we are always passing pid first, let's swap the
order then.
Test: Setup work profile -> add work account
Fix:
72429434
Change-Id: I8fd05b42fa22a3e46a87b3f6a0902e0e5a797dc9
TreeHugger Robot [Wed, 24 Jan 2018 15:03:22 +0000 (15:03 +0000)]
Merge "Add broadcast when notification block state changes"
TreeHugger Robot [Wed, 24 Jan 2018 15:01:25 +0000 (15:01 +0000)]
Merge "Use stubs libs for android.test.base/runner/mock"
TreeHugger Robot [Wed, 24 Jan 2018 14:39:23 +0000 (14:39 +0000)]
Merge "Enable MediaUpdateService on userdebug and eng builds."
TreeHugger Robot [Wed, 24 Jan 2018 14:12:28 +0000 (14:12 +0000)]
Merge "Set "results source" on RemoteInput intents sent from System UI"
Oscar Key [Wed, 24 Jan 2018 13:51:26 +0000 (13:51 +0000)]
Merge "Let the transport ask for non-incremental backup."
Leon Scroggins III [Tue, 23 Jan 2018 22:17:36 +0000 (17:17 -0500)]
Revert "Use ImageDecoder for BitmapDrawable"
Bug:
72381918
Test: Covered by existing tests
This CL seems to have broken the theme tests. In addition, it changes
the behavior of a couple of cases of passing InputStreams to the
framework. Previously, the framework used BitmapFactory, which did not
close the InputStreams, but ImageDecoder does.
Planning to reland along with the fix for closing in ag/
3497523 and the
fix for the theme tests.
This reverts commit
66c6d78908e0203a497c2e97398c824b2591ea19.
Change-Id: I4ac6d0f2e1e2bb0925ae71c141bfe8a0d37e6a16
Jeffrey Vander Stoep [Wed, 24 Jan 2018 13:32:34 +0000 (13:32 +0000)]
Merge "Reland: pm: Scan-as-privileged apps that share a privileged user"
Derek Sollenberger [Mon, 22 Jan 2018 15:25:26 +0000 (10:25 -0500)]
Initial implmentation of AnimatedImageDrawables on the RenderThread.
The current implementation schedules the next frame of the images
to be decoded after the current frame completes but potentially
schedules tasks that will result in a no-op execution if a new
frame is not yet needed.
Test: HwAccelerationTest
Change-Id: I0510cb5a1b801abd651327e924deb586af0306d6
Nicolas Geoffray [Wed, 24 Jan 2018 13:02:16 +0000 (13:02 +0000)]
Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" am:
1f568c14ac am:
b91d1b3e3a
am:
b5928a2b81 -s ours
Change-Id: Ia781d4799c9b4df316a9617055f99dbdf3e51a30
Insun Kang [Wed, 24 Jan 2018 13:00:01 +0000 (22:00 +0900)]
MediaSession2: Define setAudioAttributes / setAudioFocusRequest
Test: build
Change-Id: I8ed824e1f1bd536ac37647d94f88195ec7b51bdc
Benoit Lamarche [Wed, 24 Jan 2018 12:45:48 +0000 (12:45 +0000)]
Merge "Fail when there is an ASM error" am:
4152497b4b am:
05bb83c87d
am:
5fb872e787
Change-Id: I63222e0f376184649f8634932edc6ee296418b91
Nicolas Geoffray [Wed, 24 Jan 2018 12:40:45 +0000 (12:40 +0000)]
Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" am:
1f568c14ac
am:
b91d1b3e3a
Change-Id: I8cae11d0c9e4b72bc821af2a424380adaa59847d
Benoit Lamarche [Wed, 24 Jan 2018 12:36:26 +0000 (12:36 +0000)]
Merge "Fail when there is an ASM error" am:
4152497b4b
am:
05bb83c87d
Change-Id: I27be59afd9f021c2933d10b6becb0f7542162a37
Nicolas Geoffray [Wed, 24 Jan 2018 12:25:10 +0000 (12:25 +0000)]
Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""
am:
1f568c14ac
Change-Id: I49a375508824696b3f362bce720a296d85a084aa
Benoit Lamarche [Wed, 24 Jan 2018 12:21:23 +0000 (12:21 +0000)]
Merge "Fail when there is an ASM error"
am:
4152497b4b
Change-Id: Ic5ca952591fa235c7e4a28d95d9b1cb1d4644f8a
Ricky Wai [Wed, 24 Jan 2018 12:03:07 +0000 (12:03 +0000)]
Merge "Fix cannot generate network watchlist report when database is empty"
Adrian Roos [Wed, 24 Jan 2018 11:56:32 +0000 (11:56 +0000)]
Merge "FRP: Explicitly throw UnsupportedOperation when FRP is not supported"
Petr Cermak [Fri, 19 Jan 2018 15:00:24 +0000 (15:00 +0000)]
Set "results source" on RemoteInput intents sent from System UI
If the input comes from RemoteInputView (the user manually typed an
inline reply), the source is set to RemoteInput.SOURCE_FREE_FORM_INPUT.
If the input comes from SmartReplyView (the user tapped on a smart reply
button), the source is set to RemoteInput.SOURCE_CHOICE.
Bug:
67765414
Test: atest RemoteInputViewTest SmartReplyViewTest
Change-Id: Icff46b903a968bd8457624b358d626b457569352
Petr Cermak [Thu, 18 Jan 2018 15:52:10 +0000 (15:52 +0000)]
Display smart replies in notifications
If a notification contains a RemoteInput with non-empty choices,
NotificationContentView will add a SmartReplyView to
smart_reply_container in the expanded notification layout (if present).
This feature is guarded behind
Settings.Global.ENABLE_SMART_REPLIES_IN_NOTIFICATIONS.
Screenshot: https://screenshot.googleplex.com/jEzeL2ZYLMj.png
Bug:
67765414
Test: Viewed a notification with smart replies from Android Messages
Change-Id: I24d16df086edb58f51ae63830212d68166c74f52
Neil Fuller [Wed, 24 Jan 2018 11:47:10 +0000 (11:47 +0000)]
Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""
Jin Seok Park [Wed, 24 Jan 2018 11:24:17 +0000 (11:24 +0000)]
Merge "Put latest MediaControlView2/VideoView2 code"
Jaewan Kim [Wed, 24 Jan 2018 11:05:21 +0000 (11:05 +0000)]
Merge "MediaSession2: Stop overriding MediaPlayerBase for session/controller"
Nicolas Geoffray [Wed, 24 Jan 2018 10:44:10 +0000 (10:44 +0000)]
Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""
Michal Karpinski [Wed, 24 Jan 2018 10:37:27 +0000 (10:37 +0000)]
Merge "Add restore of Settings keys to SettingsBackupAgent.RESTORE_FROM_HIGHER_SDK_INT_SUPPORTED_KEYS"
Jaewan Kim [Wed, 24 Jan 2018 04:13:53 +0000 (13:13 +0900)]
MediaSession2: Stop overriding MediaPlayerBase for session/controller
Implement AutoClosable instead
Test: Run all MediaComponents test once
Change-Id: Ibb1dac06b80230d62e17111bf2da1b2df81a164c
Sungsoo Lim [Wed, 24 Jan 2018 10:15:29 +0000 (10:15 +0000)]
Merge "VideoView2: Add API for MediaRouter intergration"
Neil Fuller [Wed, 24 Jan 2018 10:07:48 +0000 (10:07 +0000)]
Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."
AOSP build broken.
Bug:
71914112
This reverts commit
2f87d7b2ee5097eae4e2a62858fbe221dac857f6.
Hyundo Moon [Wed, 24 Jan 2018 02:16:19 +0000 (11:16 +0900)]
Put latest MediaControlView2/VideoView2 code
This CL brings latest MediaControlView2/VideoView2 code from
experimental, and it does the following:
- Fullscreen button support (ag/
3490251)
- Set prev/next listener and controlling button visibility (ag/
3498244)
Test: Ran VideoViewTest app
Change-Id: I1a64a9c98dcc625b504785728673edbee7b6935d
Jaewan Kim [Wed, 24 Jan 2018 10:00:42 +0000 (10:00 +0000)]
Merge "MediaSession2: Add MediaSession2.CommandButton"
Benoit Lamarche [Wed, 24 Jan 2018 09:59:28 +0000 (09:59 +0000)]
Merge "Fail when there is an ASM error"
Benedict Wong [Wed, 24 Jan 2018 09:54:06 +0000 (09:54 +0000)]
Merge "Add TunnelInterface API and KernelResourceRecords" am:
f811dff3bc am:
e1aa92f1c1
am:
eacecc37e8
Change-Id: I955d5090171f08e4fa20eac5bdfe761132b87d35
Benedict Wong [Wed, 24 Jan 2018 09:48:25 +0000 (09:48 +0000)]
Merge "Add xfrm mark in IpSecConfig" am:
73f79ceae9 am:
4077e802ad
am:
22734c40b4
Change-Id: Ibaee9700cc6befdf6bbdb792cb673611e571d19a
Holly Jiuyu Sun [Wed, 24 Jan 2018 09:42:42 +0000 (09:42 +0000)]
Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." am:
8fd5b7e1c3 am:
5598f5ab23
am:
687a28d77d
Change-Id: I56abcc7731ca08ed67a5123f826bfbc9ca4f74d0
Cassie Han [Wed, 24 Jan 2018 09:37:29 +0000 (09:37 +0000)]
Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents." am:
eb9452a08d am:
8e3dcbb5d3
am:
b828fa2bfc
Change-Id: I086a958cab93dcbc47103e5d0c7d91dba5aab412
Neil Fuller [Wed, 24 Jan 2018 09:19:07 +0000 (09:19 +0000)]
Merge "Resolve merge conflicts of
69791b68837bf5f19654937396f7e55e2117743e to master"
Nicolas Geoffray [Wed, 24 Jan 2018 09:11:40 +0000 (09:11 +0000)]
Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."
AOSP build broken.
Bug:
71914112
This reverts commit
2f87d7b2ee5097eae4e2a62858fbe221dac857f6.
Change-Id: I53537a6da7616fe6dbbb79927b32720bbeaf1f69
TreeHugger Robot [Wed, 24 Jan 2018 09:04:39 +0000 (09:04 +0000)]
Merge "Support conditional removal of oahl from bootclasspath"
Benedict Wong [Wed, 24 Jan 2018 09:02:56 +0000 (09:02 +0000)]
Merge "Add TunnelInterface API and KernelResourceRecords" am:
f811dff3bc
am:
e1aa92f1c1
Change-Id: If27d78708ce225a900ad78a82d9f323770223808
Benedict Wong [Wed, 24 Jan 2018 08:55:38 +0000 (08:55 +0000)]
Merge "Add TunnelInterface API and KernelResourceRecords"
am:
f811dff3bc
Change-Id: Ic8a93b2d6d8280c01808968251e6f422fa1d2340
Oscar Key [Wed, 24 Jan 2018 08:51:43 +0000 (08:51 +0000)]
Merge "Move backup of @pm@ into its own state."
TreeHugger Robot [Wed, 24 Jan 2018 08:23:22 +0000 (08:23 +0000)]
Merge "Update work profile related strings"
Benedict Wong [Wed, 24 Jan 2018 08:19:16 +0000 (08:19 +0000)]
Merge "Add xfrm mark in IpSecConfig" am:
73f79ceae9
am:
4077e802ad
Change-Id: I03ddca0611c4e0b41edc705cdb39b415205bb14b
Holly Jiuyu Sun [Wed, 24 Jan 2018 08:10:38 +0000 (08:10 +0000)]
Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." am:
8fd5b7e1c3
am:
5598f5ab23
Change-Id: Ib79c5a2d05c09c8a36dd2e761719f37520735c00
Benedict Wong [Wed, 24 Jan 2018 08:00:52 +0000 (08:00 +0000)]
Merge "Add xfrm mark in IpSecConfig"
am:
73f79ceae9
Change-Id: Idcac0878b4f74c25ef007fb7f1643fca5de80225
Holly Jiuyu Sun [Wed, 24 Jan 2018 07:48:48 +0000 (07:48 +0000)]
Merge "Add getUiccSlots() and switchSlots() in TelephonyManager."
am:
8fd5b7e1c3
Change-Id: Ia822753db39db9b383e8e987049ec4a0738ac27b
Rahul Frias [Wed, 24 Jan 2018 07:36:14 +0000 (07:36 +0000)]
Merge "Add new values to KeyRequestType"
Dmitry Dementyev [Wed, 24 Jan 2018 07:25:15 +0000 (07:25 +0000)]
Merge "Unhide RecoverableKeyStoreLoader API."
Benedict Wong [Wed, 24 Jan 2018 07:25:04 +0000 (07:25 +0000)]
Merge "Add TunnelInterface API and KernelResourceRecords"
Benedict Wong [Fri, 19 Jan 2018 02:31:45 +0000 (18:31 -0800)]
Add TunnelInterface API and KernelResourceRecords
This change adds one KernelResourceRecord type (TunnelInterfaceRecord),
and adds methods for the creation of TunnelInterfaces, as well as the
application of Transforms to the given TunnelInterfaces
As part of the generation of ikeys/okeys, a ReserveKeyTracker manages a
java bitset to avoid collisions and reserve/release keys.
Bug:
63588681
Test: Compiles, CTS, unit tests all pass on AOSP_marlin
Change-Id: I9e9b6455e27073acd4491eae666aa966b3b10e0f
TreeHugger Robot [Wed, 24 Jan 2018 07:21:35 +0000 (07:21 +0000)]
Merge "Implement activity --proto --processes"
Chalard Jean [Wed, 24 Jan 2018 06:59:26 +0000 (15:59 +0900)]
Resolve merge conflicts of
69791b68837bf5f19654937396f7e55e2117743e to master
Test: this is the exact code these changes were meant to give
without conflict had the auto-merger not squashed them
together before it tried to merge them. It was tested on
master in this state.
Change-Id: I5cbde17fb6016e5e6b5d0b04c8f41858d708ef4a
TreeHugger Robot [Wed, 24 Jan 2018 06:54:17 +0000 (06:54 +0000)]
Merge "Add APIs to manipulate Override APN."
Jaewan Kim [Wed, 24 Jan 2018 01:42:52 +0000 (10:42 +0900)]
MediaSession2: Add MediaSession2.CommandButton
And also adds APIs to share custom layout
Test: Run all MediaComponents tests once
Change-Id: I4d18a023d2809d5405e72a73f14ae1150dee34bc
Jin Seok Park [Wed, 24 Jan 2018 06:35:28 +0000 (06:35 +0000)]
Merge "Add API documentation for MediaControlView2"
Jiyong Park [Wed, 24 Jan 2018 06:30:13 +0000 (15:30 +0900)]
Use stubs libs for android.test.base/runner/mock
android.test.base/runner/mock libraries are shared libraries that are
built without SDK, but with framework interanl libraries (framework.jar,
etc). Apps or libs that are built with SDK (LOCAL_SDK_VERSION is set)
shouldn't use them, but instead the stubs version of the test framework
libraries, which are built using SDK.
This is because, the build system does not allow a module built with SDK
to depend on another module built without SDK. This has been
exceptionally allowed with warnings, but will soon be errors.
In order to prevent the expected build breakage, direct reference to the
shared libraries are all changed to the stubs libraries.
Note: no one has been using these shared libs statically. So, it is
guaranteed that they won't encounter a problem due to missing
<uses-library name="android.test.runner"/> even after this change.
Bug:
69899800
Test: m -j checkbuild
Change-Id: Ib7e2bbecdc8c9327010aa772e820e9ae84e46518
Makoto Onuki [Wed, 24 Jan 2018 06:30:10 +0000 (06:30 +0000)]
Merge "EBS: Exempt jobs scheduled for foreground apps"
TreeHugger Robot [Wed, 24 Jan 2018 06:24:29 +0000 (06:24 +0000)]
Merge "Fixing bugs in Notification proto dumping."
Cassie Han [Wed, 24 Jan 2018 06:17:42 +0000 (06:17 +0000)]
Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents." am:
eb9452a08d
am:
8e3dcbb5d3
Change-Id: Iacd500459bb8418d41bae56131ecdac0ac6471bd
yuemingw [Thu, 11 Jan 2018 12:11:44 +0000 (12:11 +0000)]
Add APIs to manipulate Override APN.
Add APIs to add, update, query and remove Override APN. Add APIs to enable
Override APNs or query if Override APNs are currently enabled.
Bug:
68208301
Test: cts test in b/
68208416
Change-Id: I65ebbb948d2ac4e31a73e1e761e32dc8ba1502c3
Sungsoo Lim [Wed, 24 Jan 2018 02:36:10 +0000 (11:36 +0900)]
VideoView2: Add API for MediaRouter intergration
Test: build
Change-Id: I3d52d332f587ea8c5b1fa97de512805001e9a130
Chalard Jean [Wed, 24 Jan 2018 06:11:06 +0000 (06:11 +0000)]
Merge changes I3b16caad,Iaf5ea7ab,I09a94042,I69a39039,I35300309, ... am:
6568170b32
am:
84af3a7b2b
Change-Id: I3f2185330789a8b02cc5e05912e3f17256ba1b86
TreeHugger Robot [Wed, 24 Jan 2018 06:09:21 +0000 (06:09 +0000)]
Merge "Added STORAGE_VOLUME_ACCESS_SETTINGS intent."
Cassie Han [Wed, 24 Jan 2018 06:06:59 +0000 (06:06 +0000)]
Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents."
am:
eb9452a08d
Change-Id: Iaa4e291d0926db9ddb8123a7ec72acf1e82c4d84
Chalard Jean [Wed, 24 Jan 2018 06:03:41 +0000 (06:03 +0000)]
Merge changes I3b16caad,Iaf5ea7ab,I09a94042,I69a39039,I35300309, ...
am:
6568170b32
Change-Id: I49269ac65138be59d68561ea1c15ff2ad0339d8b
TreeHugger Robot [Wed, 24 Jan 2018 05:55:42 +0000 (05:55 +0000)]
Merge "Propagate location mode properly from SettingsProvider"
Benedict Wong [Wed, 24 Jan 2018 05:53:29 +0000 (05:53 +0000)]
Merge "Add xfrm mark in IpSecConfig"
TreeHugger Robot [Wed, 24 Jan 2018 05:47:30 +0000 (05:47 +0000)]
Merge "Fix wrong use if "!UserHandle.isApp()""
Chenbo Feng [Wed, 24 Jan 2018 05:46:52 +0000 (05:46 +0000)]
Merge changes from topic "bpfStats" am:
6e03224697 am:
e041f38289
am:
cf4b551fb7
Change-Id: I672efa1221e17d0962ca5702330fc83d75fcac81
Oscar Shu [Wed, 24 Jan 2018 05:41:39 +0000 (05:41 +0000)]
Merge "Remove unused fields in ScanResult.java"
Holly Jiuyu Sun [Wed, 24 Jan 2018 05:39:57 +0000 (05:39 +0000)]
Merge "Add cardId in EuiccCardManager API." am:
a85291bfcf am:
50b8d3ef75
am:
9d5d23b69a
Change-Id: Ie922ef52b4fb5b6ee95bb5976b16d5f54d9b43a1
Chenbo Feng [Wed, 24 Jan 2018 05:39:54 +0000 (05:39 +0000)]
Merge changes from topic "bpfStats" am:
6e03224697
am:
e041f38289
Change-Id: Ib4790159fd331858ce9f3343a44ccec66fae638c
Jin Seok Park [Tue, 23 Jan 2018 15:52:11 +0000 (00:52 +0900)]
Add API documentation for MediaControlView2
Test: ran 'make doc-comment-check-docs' after removing @hide tag.
Change-Id: I0eb45ed92e853ec1683c54863f0fdecccd2aa6e9
Holly Jiuyu Sun [Wed, 24 Jan 2018 05:33:02 +0000 (05:33 +0000)]
Merge "Add cardId in EuiccCardManager API." am:
a85291bfcf
am:
50b8d3ef75
Change-Id: I7fdb6666728bfa31405d23c5880dba2c63a89e41
Chenbo Feng [Wed, 24 Jan 2018 05:32:34 +0000 (05:32 +0000)]
Merge changes from topic "bpfStats"
am:
6e03224697
Change-Id: I488be110cca66990f44f6e45d5489ce23f36432e
Holly Jiuyu Sun [Wed, 24 Jan 2018 05:25:49 +0000 (05:25 +0000)]
Merge "Add cardId in EuiccCardManager API."
am:
a85291bfcf
Change-Id: I583cb9bb3673b197331a032510c1949edf3dcf9c
TreeHugger Robot [Wed, 24 Jan 2018 05:15:44 +0000 (05:15 +0000)]
Merge changes Idd092c44,I85f7686e
* changes:
Indication area alignment in AOD
Fix alignment of ambient notificaiton
Holly Jiuyu Sun [Wed, 24 Jan 2018 05:08:19 +0000 (05:08 +0000)]
Merge "Add getUiccSlots() and switchSlots() in TelephonyManager."
Kevin Chyn [Wed, 24 Jan 2018 04:58:32 +0000 (04:58 +0000)]
Merge "Minor cleanup for FingerprintDialog"
Cassie Han [Wed, 24 Jan 2018 04:55:32 +0000 (04:55 +0000)]
Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents."
Jaewan Kim [Wed, 24 Jan 2018 04:41:09 +0000 (04:41 +0000)]
Merge changes from topics "medialibraryservice2", "mediabrowser2"
* changes:
MediaSession2: Initial commit of MediaLibraryService2
MediaSession2: Initial commit of MediaBrowser2
TreeHugger Robot [Wed, 24 Jan 2018 04:33:46 +0000 (04:33 +0000)]
Merge "Keep history of standby bucket changes."
Yangster-mac [Wed, 24 Jan 2018 04:17:35 +0000 (20:17 -0800)]
Do not output empty metric reports.
Test: statsd unit test passed.
Change-Id: I296edbe621eaea72ad2e1dfe656698302614c0f3
TreeHugger Robot [Wed, 24 Jan 2018 04:21:42 +0000 (04:21 +0000)]
Merge "Adding privacy tags to battery-related protos."
TreeHugger Robot [Wed, 24 Jan 2018 04:19:20 +0000 (04:19 +0000)]
Merge "Add new refresh key constant."
TreeHugger Robot [Wed, 24 Jan 2018 04:10:58 +0000 (04:10 +0000)]
Merge "Don't crash the app when the assist structure cannot be retrieve."
Chalard Jean [Wed, 24 Jan 2018 04:09:44 +0000 (04:09 +0000)]
Merge changes I3b16caad,Iaf5ea7ab,I09a94042,I69a39039,I35300309, ...
* changes:
Let network requests see VPNs.
Move constants into a new file.
Make sure listen requests from VPN apps see their own networks
Add a test for new UID checking code.
Remove UID_RANGES_ADDED and REMOVED.
Move VPN allowed UIDs into NetworkCapabilities.
Pre-import to remove a conflict.
Jeff Vander Stoep [Tue, 23 Jan 2018 09:16:18 +0000 (01:16 -0800)]
Reland: pm: Scan-as-privileged apps that share a privileged user
Commits
2ede04735081bd8c0e399a280484fb9e6089f33f and
77029c5b16351775cb2333369ef9a4bc1d9acf58 touch the same code in
PackageManager. They landed in master at the same time causing
a build breakage. Reland with fixes to PackageSetting signatures
usage.
Bug:
72235911
Test: build/flash Taimen, verify userdictionary provider
is scanned as priv-app.
Test: gts-tradefed run everything
Change-Id: I57818409fa2f21c4f8f54651dd539790005d3e92
Treehugger Robot [Wed, 24 Jan 2018 04:08:29 +0000 (04:08 +0000)]
Merge changes from topic "bpfStats"
* changes:
Use /proc/net/dev to get stats summary
Add bpf support for NetworkStatsFactory
Add BPF support for NetworkStatsService