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

355132 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Siyamed Sinir
579642a2e6 Merge "Expose locales with alternative numbering systems." 2018-01-23 17:35:59 +00:00
Siyamed Sinir
bb80480720 Merge "Use numbering system for configuration selection." 2018-01-23 17:35:59 +00:00
TreeHugger Robot
411985bab5 Merge "Sync statsd google3 protos to aosp." 2018-01-23 17:25:29 +00:00
TreeHugger Robot
011651c560 Merge "Frameworks: Fix scoping problem in SQLite" 2018-01-23 17:20:31 +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
e74fa6c231 Merge "Add new MediaDrm methods" 2018-01-23 17:07:40 +00:00
TreeHugger Robot
d66cfdfc9a Merge "AudioFocusRequest: add ability to force ducking for a11y" 2018-01-23 16:46:10 +00:00
Yangster
b84e8b1fcf Sync statsd google3 protos to aosp. 
Test: statsd unit tests passed
Change-Id: I66b05478b7c5b0f9fdd6386b2e2ba7c38a3f9b88
 2018-01-23 16:42:24 +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
Adrian Roos
4e3ead326e Merge "DisplayCutout: Add more display cutout flavors" 2018-01-23 15:23:55 +00:00
Leon Scroggins
d3f9248bd7 Merge "Unhide ImageDecoder" 2018-01-23 15:19:43 +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
Jorim Jaggi
4d8d32cb6a Fix issue with permission check for shortcuts and pendingIntent 
When launching a PendingIntent, we have two sets of activity
options: One supplied from the caller that obtained the
pending intent, and those supplied from the caller that is
sending it. We need to perform the permission check depending
on which caller the options are coming from.

For that, we introduce SafeActivityOptions that records the
callingPid/callingUid when obtaining it and checks for the
permissions with the correct callingPid/callingUid, and
also supports merging both activity options.

In addition to that, fix shortcuts by not clearing caller
identity in LauncherAppsService.

Test: go/wm-smoke
Test: Install custom launcher APK with animation for shortcuts
enabled, make sure launch works properly.
Bug: 64674361

Change-Id: I9a854d43c65c8fa69bf16ccfbed86e8e681a095b
 2018-01-23 14:40:12 +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
Adam Lesinski
fae57eb4b8 Revert "libandroidfw: Add ApplyStyle and SetConfiguration benchmark" 
This reverts commit 62f17129a0.
 2018-01-23 03:16:33 -08:00
Adam Lesinski
50706b6ebc Revert "libandroidfw: Improve performance of AssetManager2" 
This reverts commit 3921327484.
 2018-01-23 03:16:16 -08:00
TreeHugger Robot
9e500594c0 Merge "Fail KeySyncTask if the PlatformKey can't be used to decrypt" 2018-01-23 09:59:27 +00:00
Jaewan Kim
b78ea164d6 Merge "MediaSession2: Introduce MediaSession2.Command / CommandGroup" 2018-01-23 09:52:03 +00:00
Jaewan Kim
727e3d2872 Merge "MediaSession2: Move MediaSession2/MediaController2 from experimental" 2018-01-23 09:46:10 +00:00
Insun Kang
0945bb7418 Merge "Release MediaSession when VideoView2 is detached from window." 2018-01-23 09:40:24 +00: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
ec8c24862b Merge "Handle return value 0 from android_logger_list_read" 2018-01-23 07:46:23 +00:00
TreeHugger Robot
a92805d2cf Merge "Revert "Revert "Enable init.rc for statsd to start statsd by default in boot time""" 2018-01-23 07:46:23 +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
TreeHugger Robot
26466e44b7 Merge "add system uptime and free disk space atoms and pullers" 2018-01-23 06:03:21 +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
e2a345aadf Merge "Re-enable NetworkPolicyManagerServiceTest." 2018-01-23 05:47:53 +00:00
Jaewan Kim
589795d12d MediaSession2: Introduce MediaSession2.Command / CommandGroup 
Test: Run all tests once
Change-Id: I2ccafcdac5247c9f008b8d4fe50b974ea47fdeed
 2018-01-23 14:36:20 +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
Jaewan Kim
ceb6b6e131 MediaSession2: Move MediaSession2/MediaController2 from experimental 
APIs will be unhidden later

Test: Run MediaComponentsTest
Change-Id: I2d9fcd98232016281fad128e9e674885b41e20d9
 2018-01-23 14:02:08 +09: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
TreeHugger Robot
6703f8e67d Merge "Notification shade expansion animation" 2018-01-23 04:09:19 +00:00
Chenjie Yu
937d74294e add system uptime and free disk space atoms and pullers 
Test: will add cts later
Change-Id: I0b906fab82fca89b85bc0c7fbe06078115d43eec
 2018-01-22 20:06:52 -08: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