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

355648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chong Zhang
9519257763 Merge "MediaCodec: expose constant quality mode" 2018-01-25 02:47:59 +00:00
TreeHugger Robot
1ccf72543d 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-25 02:05:30 +00:00
TreeHugger Robot
b5f12bbd2f Merge "Add statsd microbenchmark and fix a crash in LogEvent" 2018-01-25 02:04:11 +00:00
TreeHugger Robot
07c15cb88a Merge "Add flag to SysUI for Hybrid notification" 2018-01-25 01:49:22 +00:00
TreeHugger Robot
0271ef9895 Merge changes I8d43f5bc,I5ca4b0ca 
* changes:
  OMS: Enable uninstallation of overlays
  PackageManager: allow overlays to be installed when signature matches platform cert
 2018-01-25 01:31:34 +00:00
David Brazdil
71e8c4092f Merge "Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps" am: 50cfaa40ca am: 97a970e56b 
am: 5fab14313b

Change-Id: I788ad36976b6c63670f40c735380982e6567df86
 2018-01-25 01:20:47 +00:00
David Brazdil
5fab14313b Merge "Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps" am: 50cfaa40ca 
am: 97a970e56b

Change-Id: I73eaa052597d225aa673dd479977b0ce7a7d6d64
 2018-01-25 01:12:33 +00:00
David Brazdil
97a970e56b Merge "Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps" 
am: 50cfaa40ca

Change-Id: I7aa3c86bae54b4f55cbb5cfe8ddf076fedf6177b
 2018-01-25 01:06:15 +00:00
Ningyuan Wang
4a014d8fce Merge "Remove WifiManager 'scanWithTraffic' APIs" 2018-01-25 01:03:15 +00:00
Mukesh Agrawal
5e24057999 Merge changes I72baa5ca,I0366341a 
* changes:
  WifiConfiguration: deprecate WPA-1 related fields
  WifiConfiguration: deprecate WEP-related fields
 2018-01-25 00:59:47 +00:00
Nathan Harold
1e39ade047 Merge changes from topic "keepalive-on-cell" 
* changes:
  Rework KeepalivePacketData for Compatibility with Cell
  Add Constants for NATT Keepalive to RILConstants
  Relocate KeepalivePacketData to frameworks/base
 2018-01-25 00:48:43 +00:00
Beverly Tai
5d0f8f0772 Merge "QS DND tile secondary text added" 2018-01-25 00:47:07 +00:00
Leif Wilden
673892c6c2 Merge "Unrevert "Move instrumentation classes to SettingsLib to share between mobile/TV.""" 2018-01-25 00:35:26 +00:00
Lingfeng Yang
7362c89d96 Merge "Don't use shader disk cache on emulator" 2018-01-25 00:31:34 +00:00
Victor Hsieh
d93a795945 Merge "Enable verity to updated priv app if root hash exists" 2018-01-25 00:25:16 +00:00
Evan Rosky
c41adfac71 Merge "Expose selector draw condition for test" 2018-01-25 00:08:03 +00:00
TreeHugger Robot
1266a4f5d5 Merge "MAC Randomization: Store Randomized MAC Address in WifiConfiguration" 2018-01-24 23:57:47 +00:00
Calin Juravle
3c5b60a7fb Merge "Accept UserHandle.USER_ALL during profile preparation" 2018-01-24 23:48:18 +00:00
Jeremy Klein
2ffeef2a35 Merge "Add scan interval and window lengths to Settings.Global." am: d3dac85e46 am: 8c33c789ed 
am: 4ec192fd26

Change-Id: Ieae2e96acac3f1372d4075145426065f666a221a
 2018-01-24 23:46:11 +00:00
Android Build Merger (Role)
f88fdc995f Merge "Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am: ec44a402d2 am: 596c22a84d am: 07b212b788" 2018-01-24 23:38:15 +00:00
Holly Jiuyu Sun
047707c7aa Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am: ec44a402d2 am: 596c22a84d 
am: 07b212b788

Change-Id: I771845c9f07aa18946c0ab99fffd2a08d888e819
 2018-01-24 23:37:16 +00:00
TreeHugger Robot
e9d3cc5ad8 Merge "ActivityManager: add API for wifi bug report" 2018-01-24 23:36:19 +00:00
Jeremy Klein
4ec192fd26 Merge "Add scan interval and window lengths to Settings.Global." am: d3dac85e46 
am: 8c33c789ed

Change-Id: Ib86750eadcf5683faba4151e3f3373f04a387de1
 2018-01-24 23:34:38 +00:00
Steven Moreland
cb15919569 Merge "Allow HIDL to be used in priv-apps." 2018-01-24 23:32:38 +00:00
Pankaj Kanwar
65b79f7edb Merge "Metrics wifi.proto for connected wifi score" into oc-mr1-dev am: e2bc2efe3c 
am: 43a3671a42  -s ours

Change-Id: Ie98d1e6aee39427d2ec87dcea50aed9bf0ead023
 2018-01-24 23:27:27 +00:00
Holly Jiuyu Sun
07b212b788 Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am: ec44a402d2 
am: 596c22a84d

Change-Id: I6320f2195eeb2221fb29778b6171c3ebdb3f8dac
 2018-01-24 23:24:29 +00:00
Tobias Thierer
5e5c8d7768 Merge "Deprecate android.util.Mutable*." 2018-01-24 23:19:33 +00:00
Adam Lesinski
64ee69d0f1 libandroidfw: Improve performance of AssetManager2 
AssetManager2 relied on creating a list of configurations
present in the resource table so as to avoid copying and
converting ResTable_config's from the APK on every
resource retrieval.

ResTable, however, had a better optimization that pruned
the configurations that didn't match the currently set
configuration. This vastly reduced the number of ResTable_configs
to test.

In this CL, AssetManager2 follows suite with this optimization
and only maintains the filtered ResTable_configs, falling back
to the slow path when the configuration is overridden.

Test: mma frameworks/base/libs/androidfw
Test: adb sync system data
Test: adb shell /data/benchmarktest64/libandroidfw_benchmarks/libandroidfw_benchmarks
Change-Id: I5d46f8b005a37b72750d00bd75f090e7b5a36f60
 2018-01-24 15:19:09 -08:00
Adam Lesinski
d9c809c480 libandroidfw: Add ApplyStyle and SetConfiguration benchmark 
Test: mma frameworks/base/libs/androidfw
Test: adb sync system data
Test: adb shell /data/benchmarktest64/libandroidfw_benchmarks/libandroidfw_benchmarks
Change-Id: Ia6b441f186ccb455acbee15723f0d2d5657b09b5
 2018-01-24 15:19:09 -08:00
Adam Lesinski
e70b57a659 Make idiomatic use of ApkAssets and AssetManager 
Move away from using deprecated addAssetPath methods
and cache the instances of ApkAssets created.

Test: CTS passes
Change-Id: I257c72261a97e4aa802abb46dc1f44d80e1d42ad
 2018-01-24 15:19:09 -08:00
Adam Lesinski
dcb3c6559b Replace AssetManager with AssetManager2 implementation 
Test: atest CtsContentTestCases:android.content.res.cts
Test: make libandroidfw_tests
Change-Id: I572eb13c6a4372c7f656f5912821cececd5bf3d4
 2018-01-24 15:19:04 -08:00
Pankaj Kanwar
43a3671a42 Merge "Metrics wifi.proto for connected wifi score" into oc-mr1-dev 
am: e2bc2efe3c

Change-Id: Ie1366ad3364176dce6a5f7b5a78a19b7806030cd
 2018-01-24 23:14:30 +00:00
Jeremy Klein
8c33c789ed Merge "Add scan interval and window lengths to Settings.Global." 
am: d3dac85e46

Change-Id: Ibae30208c4f0f2ad8bf8e508778d73f0883ef42e
 2018-01-24 23:13:31 +00:00
Chong Zhang
8883329936 MediaCodec: expose constant quality mode 
Also fix a bug where the supported bitcontrol mode
bitmask is wrong.

bug: 63633199
Change-Id: Ib2c21b0d846bcc31f61027d875f801a2282c1101
 2018-01-24 15:10:03 -08:00
Derek Sollenberger
c04c265dd5 Merge "Fix bug in ImageDecoder which provided the incorrect density to NinePatchDrawables" 2018-01-24 23:09:53 +00:00
Treehugger Robot
50cfaa40ca Merge "Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps" 2018-01-24 23:09:28 +00:00
Holly Jiuyu Sun
596c22a84d Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" 
am: ec44a402d2

Change-Id: I6ded59329716f073b30964940ab6574360406778
 2018-01-24 23:05:25 +00:00
Pankaj Kanwar
e2bc2efe3c Merge "Metrics wifi.proto for connected wifi score" into oc-mr1-dev 2018-01-24 23:02:22 +00:00
Howard Ro
b2b547454b Merge "Fix adb shell cmd config remove command when no (uid, id) pair is specified." 2018-01-24 23:00:14 +00:00
Calin Juravle
5bbe26ee01 Accept UserHandle.USER_ALL during profile preparation 
Test: adb install foo.apk
Bug: 72453027
Change-Id: I840d70d47a256c8853bbe1b9b023f51bdd5ddf6b
 2018-01-24 14:56:34 -08:00
Android Build Merger (Role)
e891dbaa4f Merge "Merge "Set DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps" am: 2a8c24be18 am: 6dea42ae0f am: 2a21a9c997 -s ours" 2018-01-24 22:44:52 +00:00
David Brazdil
367988b73b Merge "Set DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps" am: 2a8c24be18 am: 6dea42ae0f 
am: 2a21a9c997  -s ours

Change-Id: I36d988ae251bcee837a0f3ab7630fd82d099adc8
 2018-01-24 22:44:30 +00:00
Android Build Merger (Role)
9f1dd93b2a Merge "Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario." am: 7a481bde6d am: f343e33dd5 am: e39de15109" 2018-01-24 22:39:45 +00:00
Tyler Gunn
c3f129c795 Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario." am: 7a481bde6d am: f343e33dd5 
am: e39de15109

Change-Id: I48b1c82a051342b6a4504290a6297aebc8a2bdfd
 2018-01-24 22:38:52 +00:00
Wei Jia
8069cd9861 Merge "add MediaPlayer2" 2018-01-24 22:35:43 +00:00
Android Build Merger (Role)
71df9bf176 Merge "Merge "Added network service interface" am: 71793be6bb am: 2b06789511 am: 3748d15321" 2018-01-24 22:33:21 +00:00
Xiangyu/Malcolm Chen
7783ecd755 Merge "Added network service interface" am: 71793be6bb am: 2b06789511 
am: 3748d15321

Change-Id: Ia08a840e47d3372772a105ef7b65bb259d07e7f8
 2018-01-24 22:32:56 +00:00
Mohamed Abdalkader
41db489a43 Merge "Remove internal version of SMS apis" 2018-01-24 22:32:39 +00:00
TreeHugger Robot
82c2173b67 Merge "Statsd always includes snapshot of uid map." 2018-01-24 22:31:24 +00:00
Jorim Jaggi
6d2b351791 Merge "Fix NPE from refactoring" 2018-01-24 22:15:36 +00:00