Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
355,430 Commits 3 Branches 0 Tags
c8d6489c656fa3ecd245acc4d2b9b4d181a1f95b
Commit Graph

355430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
c8d6489c65 Merge "Display smart replies in notifications" 2018-01-24 15:18:24 +00:00
TreeHugger Robot
d12ad36399 Merge "Add broadcast when notification block state changes" 2018-01-24 15:03:22 +00:00
TreeHugger Robot
ff8b2745a5 Merge "Use stubs libs for android.test.base/runner/mock" 2018-01-24 15:01:25 +00:00
TreeHugger Robot
ac9a7c05c2 Merge "Enable MediaUpdateService on userdebug and eng builds." 2018-01-24 14:39:23 +00:00
TreeHugger Robot
3351da1d33 Merge "Set "results source" on RemoteInput intents sent from System UI" 2018-01-24 14:12:28 +00:00
Oscar Key
9712788a06 Merge "Let the transport ask for non-incremental backup." 2018-01-24 13:51:26 +00:00
Jeffrey Vander Stoep
32f891dae3 Merge "Reland: pm: Scan-as-privileged apps that share a privileged user" 2018-01-24 13:32:34 +00:00
Nicolas Geoffray
e1350ba9ea Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" am: 1f568c14ac am: b91d1b3e3a 
am: b5928a2b81  -s ours

Change-Id: Ia781d4799c9b4df316a9617055f99dbdf3e51a30
 2018-01-24 13:02:16 +00:00
Benoit Lamarche
ae992b6392 Merge "Fail when there is an ASM error" am: 4152497b4b am: 05bb83c87d 
am: 5fb872e787

Change-Id: I63222e0f376184649f8634932edc6ee296418b91
 2018-01-24 12:45:48 +00:00
Nicolas Geoffray
b5928a2b81 Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" am: 1f568c14ac 
am: b91d1b3e3a

Change-Id: I8cae11d0c9e4b72bc821af2a424380adaa59847d
 2018-01-24 12:40:45 +00:00
Benoit Lamarche
5fb872e787 Merge "Fail when there is an ASM error" am: 4152497b4b 
am: 05bb83c87d

Change-Id: I27be59afd9f021c2933d10b6becb0f7542162a37
 2018-01-24 12:36:26 +00:00
Nicolas Geoffray
b91d1b3e3a Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" 
am: 1f568c14ac

Change-Id: I49a375508824696b3f362bce720a296d85a084aa
 2018-01-24 12:25:10 +00:00
Benoit Lamarche
05bb83c87d Merge "Fail when there is an ASM error" 
am: 4152497b4b

Change-Id: Ic5ca952591fa235c7e4a28d95d9b1cb1d4644f8a
 2018-01-24 12:21:23 +00:00
Ricky Wai
240ad971eb Merge "Fix cannot generate network watchlist report when database is empty" 2018-01-24 12:03:07 +00:00
Adrian Roos
0d2d90d221 Merge "FRP: Explicitly throw UnsupportedOperation when FRP is not supported" 2018-01-24 11:56:32 +00:00
Petr Cermak
9a3380c08c 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
 2018-01-24 11:54:00 +00:00
Petr Cermak
7997d7a0c5 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
 2018-01-24 11:53:57 +00:00
Neil Fuller
f12f652c97 Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" 2018-01-24 11:47:10 +00:00
Jin Seok Park
421e7ec3df Merge "Put latest MediaControlView2/VideoView2 code" 2018-01-24 11:24:17 +00:00
Jaewan Kim
495ea5f826 Merge "MediaSession2: Stop overriding MediaPlayerBase for session/controller" 2018-01-24 11:05:21 +00:00
Nicolas Geoffray
1f568c14ac Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" 2018-01-24 10:44:10 +00:00
Michal Karpinski
6e39b9556a Merge "Add restore of Settings keys to SettingsBackupAgent.RESTORE_FROM_HIGHER_SDK_INT_SUPPORTED_KEYS" 2018-01-24 10:37:27 +00:00
Jaewan Kim
cf707c4741 MediaSession2: Stop overriding MediaPlayerBase for session/controller 
Implement AutoClosable instead

Test: Run all MediaComponents test once
Change-Id: Ibb1dac06b80230d62e17111bf2da1b2df81a164c
 2018-01-24 19:16:21 +09:00
Sungsoo Lim
c9af5b3076 Merge "VideoView2: Add API for MediaRouter intergration" 2018-01-24 10:15:29 +00:00
Neil Fuller
4cfc02a316 Revert "Add getUiccSlots() and switchSlots() in TelephonyManager." 
AOSP build broken.

Bug: 71914112

This reverts commit 2f87d7b2ee.
 2018-01-24 10:07:48 +00:00
Hyundo Moon
efeb45eabd 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
 2018-01-24 19:07:38 +09:00
Jaewan Kim
7800fef943 Merge "MediaSession2: Add MediaSession2.CommandButton" 2018-01-24 10:00:42 +00:00
Benoit Lamarche
4152497b4b Merge "Fail when there is an ASM error" 2018-01-24 09:59:28 +00:00
Benedict Wong
f68e5b63ca Merge "Add TunnelInterface API and KernelResourceRecords" am: f811dff3bc am: e1aa92f1c1 
am: eacecc37e8

Change-Id: I955d5090171f08e4fa20eac5bdfe761132b87d35
 2018-01-24 09:54:06 +00:00
Benedict Wong
e65d8141de Merge "Add xfrm mark in IpSecConfig" am: 73f79ceae9 am: 4077e802ad 
am: 22734c40b4

Change-Id: Ibaee9700cc6befdf6bbdb792cb673611e571d19a
 2018-01-24 09:48:25 +00:00
Holly Jiuyu Sun
d201c4dd51 Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." am: 8fd5b7e1c3 am: 5598f5ab23 
am: 687a28d77d

Change-Id: I56abcc7731ca08ed67a5123f826bfbc9ca4f74d0
 2018-01-24 09:42:42 +00:00
Cassie Han
a600b31201 Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents." am: eb9452a08d am: 8e3dcbb5d3 
am: b828fa2bfc

Change-Id: I086a958cab93dcbc47103e5d0c7d91dba5aab412
 2018-01-24 09:37:29 +00:00
Neil Fuller
f96cb59c16 Merge "Resolve merge conflicts of 69791b6883 to master" 2018-01-24 09:19:07 +00:00
Nicolas Geoffray
5c9dcc0e72 Revert "Add getUiccSlots() and switchSlots() in TelephonyManager." 
AOSP build broken.

Bug: 71914112

This reverts commit 2f87d7b2ee.

Change-Id: I53537a6da7616fe6dbbb79927b32720bbeaf1f69
 2018-01-24 09:11:40 +00:00
TreeHugger Robot
19630d165e Merge "Support conditional removal of oahl from bootclasspath" 2018-01-24 09:04:39 +00:00
Benedict Wong
eacecc37e8 Merge "Add TunnelInterface API and KernelResourceRecords" am: f811dff3bc 
am: e1aa92f1c1

Change-Id: If27d78708ce225a900ad78a82d9f323770223808
 2018-01-24 09:02:56 +00:00
Benedict Wong
e1aa92f1c1 Merge "Add TunnelInterface API and KernelResourceRecords" 
am: f811dff3bc

Change-Id: Ic8a93b2d6d8280c01808968251e6f422fa1d2340
 2018-01-24 08:55:38 +00:00
Oscar Key
a8e4641436 Merge "Move backup of @pm@ into its own state." 2018-01-24 08:51:43 +00:00
TreeHugger Robot
70ffca95b1 Merge "Update work profile related strings" 2018-01-24 08:23:22 +00:00
Benedict Wong
22734c40b4 Merge "Add xfrm mark in IpSecConfig" am: 73f79ceae9 
am: 4077e802ad

Change-Id: I03ddca0611c4e0b41edc705cdb39b415205bb14b
 2018-01-24 08:19:16 +00:00
Holly Jiuyu Sun
687a28d77d Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." am: 8fd5b7e1c3 
am: 5598f5ab23

Change-Id: Ib79c5a2d05c09c8a36dd2e761719f37520735c00
 2018-01-24 08:10:38 +00:00
Benedict Wong
4077e802ad Merge "Add xfrm mark in IpSecConfig" 
am: 73f79ceae9

Change-Id: Idcac0878b4f74c25ef007fb7f1643fca5de80225
 2018-01-24 08:00:52 +00:00
Holly Jiuyu Sun
5598f5ab23 Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." 
am: 8fd5b7e1c3

Change-Id: Ia822753db39db9b383e8e987049ec4a0738ac27b
 2018-01-24 07:48:48 +00:00
Rahul Frias
bbf96b1af1 Merge "Add new values to KeyRequestType" 2018-01-24 07:36:14 +00:00
Dmitry Dementyev
8df0200e84 Merge "Unhide RecoverableKeyStoreLoader API." 2018-01-24 07:25:15 +00:00
Benedict Wong
f811dff3bc Merge "Add TunnelInterface API and KernelResourceRecords" 2018-01-24 07:25:04 +00:00
Benedict Wong
8149f6eb6c 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
 2018-01-24 07:24:27 +00:00
TreeHugger Robot
449e7d62a5 Merge "Implement activity --proto --processes" 2018-01-24 07:21:35 +00:00
Chalard Jean
2c852db564 Resolve merge conflicts of 69791b6883 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
 2018-01-24 15:59:26 +09:00
TreeHugger Robot
192e0870b3 Merge "Add APIs to manipulate Override APN." 2018-01-24 06:54:17 +00:00