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

86467 Commits

Author SHA1 Message Date
Roberto Perez
c4788e1f04 Merge "Adding a new category to mark car-optimized launcher activity" 2018-01-23 18:21:59 +00:00
TreeHugger Robot
7e004f96dd Merge "Atom: WifiMulticastLockStateChanged" 2018-01-23 18:09:20 +00:00
Neil Fuller
ee33ac4bd2 Merge "Improve dumpsys for installed distros" 2018-01-23 17:54:29 +00:00
Jorim Jaggi
15e76d620a Merge changes I2b6bfca0,I9a854d43 
* changes:
  Add option to retrieve pending intent result
  Fix issue with permission check for shortcuts and pendingIntent
 2018-01-23 17:14:03 +00:00
TreeHugger Robot
4953824b89 Merge "Fix registerSliceCallback to match api guidelines" 2018-01-23 16:38:16 +00:00
Amit Mahajan
6ba8bc8a47 Merge "Added new slot status related broadcast." 2018-01-23 16:28:16 +00:00
Ricky Wai
cee2094d75 Merge "Add update network watchlist config ConfigUpdater intent action" 2018-01-23 14:27:29 +00:00
Ricky Wai
c61216d4a2 Merge "Add ConnectivityManager.getNetworkWatchlistConfigHash()" 2018-01-23 14:25:39 +00:00
Jason Monk
e0bba99c94 Merge "Remove slice: from SliceProvider docs" 2018-01-23 14:24:35 +00:00
TreeHugger Robot
414b665f2d Merge "Make BulletSpan more flexible and update JavaDoc." 2018-01-23 13:57:29 +00:00
TreeHugger Robot
2c78c181e7 Merge "Track the most recent notifying packages" 2018-01-23 13:56:24 +00:00
Jorim Jaggi
e2ad37f9bc Add option to retrieve pending intent result 
Used by SystemUI to check whether an activity start will
actually lead to something animating.

Also fixes an issue where we return MOVED_TO_FRONT instead of
DELIVERED_TO_TOP.

Test: go/wm-smoke
Test: Use PendingIntent.sendAndReturnResult
Change-Id: I2b6bfca0a53125635bc462f32ab7eaae366c0c8a
 2018-01-23 14:40:28 +01:00
Florina Muntenescu
987189b936 Make BulletSpan more flexible and update JavaDoc. 
Test: BulletSpanTest
Bug: 72217003
Change-Id: I0ba4d93bd5a7bac02410e0edbd4b20f254959d4e
 2018-01-23 12:08:39 +00:00
Adam Lesinski
a8c7794856 Merge changes Ib67ad0da,Ie532f29a,Ieabc1777,Ied210b3e 
* changes:
  Revert "Replace AssetManager with AssetManager2 implementation"
  Revert "Make idiomatic use of ApkAssets and AssetManager"
  Revert "libandroidfw: Add ApplyStyle and SetConfiguration benchmark"
  Revert "libandroidfw: Improve performance of AssetManager2"
 2018-01-23 11:41:15 +00:00
Adam Lesinski
7fb3831136 Revert "Replace AssetManager with AssetManager2 implementation" 
This reverts commit b20a0ce59f.
 2018-01-23 03:17:26 -08:00
Adam Lesinski
68d10d00a5 Revert "Make idiomatic use of ApkAssets and AssetManager" 
This reverts commit c857766ca5.
 2018-01-23 03:17:01 -08:00
Insun Kang
0945bb7418 Merge "Release MediaSession when VideoView2 is detached from window." 2018-01-23 09:40:24 +00:00
Tej Singh
4503e10b59 Atom: WifiMulticastLockStateChanged 
Add WifiMulticastLockStateChanged to atoms.proto
Add log lines

Test: CTS test in accompanying CL
Change-Id: I9b4b861a2de5254c9b7f41c15ab0fbb76af4ff6e
 2018-01-23 00:41:49 -08:00
Insun Kang
eb78d511cb Add API docs for VideoView2 
Test: ran 'make doc-comment-check-docs' after removing @hide tag.
Change-Id: I1c3492e8c302b9a6222b5400e71ccbabaaa372a3
 2018-01-23 08:11:47 +00:00
TreeHugger Robot
426deb4da7 Merge "Add flag for a V2 of the About Phone page." 2018-01-23 07:04:29 +00:00
Jong Wook Kim
16c5d2c8d2 Merge "Wifi MAC Randomization: Developer option change global settings" 2018-01-23 06:40:51 +00:00
Ricky Wai
44dcbde52a Add ConnectivityManager.getNetworkWatchlistConfigHash() 
Apps can use this API to get network watchlist config hash for auditing.

Bug: 63908748
Test: Able to compile
Change-Id: I5ce9e6bb6dad88139c0a102da58be0dd7c284b7a
 2018-01-23 06:32:36 +00:00
Insun Kang
fd3fdfdfed Release MediaSession when VideoView2 is detached from window. 
Test: build
Change-Id: I36baae35cc8196e3fa2fc9f9bdda4219ffaf863d
 2018-01-23 15:01:37 +09:00
TreeHugger Robot
9683b889d9 Merge "add atom and logging for Picture-in-Picture feature" 2018-01-23 05:34:29 +00:00
Adam Lesinski
1f62f7c72e Merge changes from topic "assetmanager-refactor" 
* changes:
  libandroidfw: Improve performance of AssetManager2
  libandroidfw: Add ApplyStyle and SetConfiguration benchmark
  Make idiomatic use of ApkAssets and AssetManager
  Replace AssetManager with AssetManager2 implementation
 2018-01-23 05:28:11 +00:00
TreeHugger Robot
060ac9bc9f Merge "Fixed Messaging style with empty senders" 2018-01-23 05:23:23 +00:00
TreeHugger Robot
43137e8e8d Merge "Add a method for fetching the WebView classloader." 2018-01-23 04:31:28 +00:00
TreeHugger Robot
03e7ec201b Merge "Add SystemApi in SystemProperties for vendor apks" 2018-01-23 04:14:01 +00:00
Calin Juravle
cd99c3a17a Merge "Perform a non strict matching of .dm files when computing the size" 2018-01-23 04:11:04 +00:00
Lorenzo Colitti
2899a0ed1b Merge "Support passing a template to NetworkStatsManager queries." 2018-01-23 04:02:58 +00:00
TreeHugger Robot
eb6ae9e43e Merge "Remove all the implementation for keep eSIM profile during FDR" 2018-01-23 03:41:43 +00:00
TreeHugger Robot
3bc6f794e6 Merge "camera: Modify AF scene change" 2018-01-23 03:03:31 +00:00
Selim Cinek
2dd3e72ac0 Fixed Messaging style with empty senders 
Empty senders were treaded badly before, leading to empty
space and a bad layout. Now the conversation title is taken
as the name of the other sender.

Bug: 63708826
Test: add message with empty senders, observe layout
Change-Id: I6d3ce84c421ddbcd55260f34e8ff5bf46437c2b6
 2018-01-22 18:57:14 -08:00
Android Build Merger (Role)
6463159684 Merge "Merge "Camera: remove NOT_PRESENT cameras" am: 174df238ac am: 0e32a62cd4 am: 75774be569" 2018-01-23 02:53:05 +00:00
Yin-Chia Yeh
2d3cae80d9 Merge "Camera: remove NOT_PRESENT cameras" am: 174df238ac am: 0e32a62cd4 
am: 75774be569

Change-Id: I71a313e35f20c51403227523060914495e67c3bc
 2018-01-23 02:52:15 +00:00
TreeHugger Robot
298f5dce77 Merge "Cellular/Wifi power profile" 2018-01-23 02:47:40 +00:00
Yin-Chia Yeh
75774be569 Merge "Camera: remove NOT_PRESENT cameras" am: 174df238ac 
am: 0e32a62cd4

Change-Id: I5b2d1d756daf1fabd8d42b9161de6a63d8989302
 2018-01-23 02:35:28 +00:00
Lorenzo Colitti
683f590c37 Merge "Remove obsolete NetworkStats.Entry constructor." am: 1683b6968d am: cdeb50aa48 
am: cbbed8ee1f

Change-Id: Id6a664fd5ad8c182468b742e810e65afee248ad5
 2018-01-23 02:35:08 +00:00
Lorenzo Colitti
cbbed8ee1f Merge "Remove obsolete NetworkStats.Entry constructor." am: 1683b6968d 
am: cdeb50aa48

Change-Id: If60b58f95707bab3ae89050234226d54386398e8
 2018-01-23 02:23:32 +00:00
Jong Wook Kim
0a20eda58d Wifi MAC Randomization: Developer option change global settings 
Enabling/disabling the connected mac randomization toggle in developer options will change Settings.Global.WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLE, which the wifi framework can look at to decide whether or not to randomized mac addresses. Also added descriptions for the toggle in developer options.

Bug: 67908229
Bug: 71548421
Test: manual testing of checking that the option correctly displays and
logs to check that the toggle correctly changes values.
Change-Id: I48a2dc34d772b0e4ce7637df904b274c9fe1218f
 2018-01-22 18:13:40 -08:00
Yin-Chia Yeh
0e32a62cd4 Merge "Camera: remove NOT_PRESENT cameras" 
am: 174df238ac

Change-Id: I2c0dd5ccd8c8a165b568563051ad42dba6082792
 2018-01-23 02:12:57 +00:00
Lorenzo Colitti
cdeb50aa48 Merge "Remove obsolete NetworkStats.Entry constructor." 
am: 1683b6968d

Change-Id: I72fe99d5e662a6a154f7b2d970c5926ee696e541
 2018-01-23 02:08:18 +00:00
Sundong Ahn
5e05a9ae1c Add SystemApi in SystemProperties for vendor apks 
The Apis in SystemProperties are needed for building ims.apk with
LOCAL_SDK_VERSION := system_current. So @SystemApi is added to
SystemProperties class and methods which are used by vendor apks (i.e.
ims.apk)

Bug: 67726847
Test: 1. build & boot on taimen
2. LOCAL_SDK_VERSION:=system_current in ims.apk && build ims.apk &&
check error count and android_system_stubs_current_intermediates.

Change-Id: I178f8d9b0b1f6bb1455ceec919805c4cc549cb32
 2018-01-23 10:02:58 +09:00
Treehugger Robot
174df238ac Merge "Camera: remove NOT_PRESENT cameras" 2018-01-23 00:52:00 +00:00
Shuzhen Wang
98da482eca Merge "camera: Add support for multiple camera capture requests" 2018-01-23 00:36:16 +00:00
Lorenzo Colitti
9c93808e5e Merge changes I4d985a27,Ic6f2bc18 
* changes:
  Add metered, roaming, and defaultNetwork info to NetworkTemplate.
  Unbreak frameworks-net tests broken by missing libutilscallstack.
 2018-01-23 00:28:39 +00:00
Lorenzo Colitti
1683b6968d Merge "Remove obsolete NetworkStats.Entry constructor." 2018-01-23 00:15:15 +00:00
Christine Franks
bae5e6bda1 Merge "Change selection strategy for ACTION_DISMISS_TIMER" 2018-01-22 23:23:25 +00:00
TreeHugger Robot
58d241ce54 Merge "camera: Add OIS data keys" 2018-01-22 23:22:30 +00:00
TreeHugger Robot
de6d13f857 Merge "Changed onGetScores() to return null instead of throwing exception." 2018-01-22 22:46:22 +00:00