Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
346,869 Commits 3 Branches 0 Tags
397b51186a52d7cd01b90d92e014a554ec271c6c
Commit Graph

346869 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
397b51186a Merge "Removes redundant RefBase inheritance." 2017-10-15 20:37:21 +00:00
Pankaj Kanwar
063a2f667e Merge "Add CarrierConfig for Invalid Call Forwarding number" into oc-mr1-dev am: 7c18f52452 
am: 5c0982c604

Change-Id: Ib075510a7e3f7ad5fe17f7dea065f1dd42328d16
 2017-10-15 06:07:33 +00:00
Pankaj Kanwar
5c0982c604 Merge "Add CarrierConfig for Invalid Call Forwarding number" into oc-mr1-dev 
am: 7c18f52452

Change-Id: I12c3b3e3a0d4ad4919df5daeb07367f6197ffa93
 2017-10-15 04:21:34 +00:00
Pankaj Kanwar
7c18f52452 Merge "Add CarrierConfig for Invalid Call Forwarding number" into oc-mr1-dev 2017-10-15 04:03:46 +00:00
Tobias Thierer
162fbe7844 Merge "Update locked_region_code_injection tool to ASM 6.0-BETA." am: 26817938f6 am: e69366ff27 am: 8e60defe4b 
am: b5a80794bb

Change-Id: I4508affe416099033cc497db5fb1894e48a9726e
 2017-10-15 03:54:47 +00:00
Wileen Chiu
ca3d1f0cf0 Merge "Add change to show Invalid card when erroneous card is inserted." am: 4bc825aecc am: 8279494137 am: 9778539847 
am: 8463b91dca

Change-Id: I01a3b8fe7e3a679f560a2e2d03d39b1d0b58fa2f
 2017-10-15 03:46:49 +00:00
Hugo Benichi
98bee8d32c Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum" am: d098328585 am: 104b2bcc79 am: 4071792cce 
am: e4cf6229f7

Change-Id: I65c210d8f0ee27540339233d45def0c464920aea
 2017-10-15 03:39:01 +00:00
Colin Cross
ad90a766fa Merge "Convert ext.jar to Android.bp" am: 42156f3e56 am: 8feea076a2 am: faededa6af 
am: 3f6bef874e

Change-Id: Icb72ff3997c59a605f7339014b48c8eb4ee13795
 2017-10-15 03:30:06 +00:00
Tobias Thierer
b5a80794bb Merge "Update locked_region_code_injection tool to ASM 6.0-BETA." am: 26817938f6 am: e69366ff27 
am: 8e60defe4b

Change-Id: Ic425066feb4288c37154d8b0c487aeda93a6ac59
 2017-10-15 03:18:47 +00:00
Mathieu Chartier
790016aef5 Merge "Add property reading logic for dalvik.vm.madvise-random" into oc-mr1-dev am: a354ec973d 
am: ecc8bdc227

Change-Id: I401df22e24210ac7aa47f5a8341f657403ebdece
 2017-10-15 03:17:12 +00:00
Wileen Chiu
8463b91dca Merge "Add change to show Invalid card when erroneous card is inserted." am: 4bc825aecc am: 8279494137 
am: 9778539847

Change-Id: Ie5915e645a4e7a35fd934f54d6d3bf25ad4fcca3
 2017-10-15 03:11:37 +00:00
Winston Man
6a7645dc0c Merge "Update CtsShim with multiArch" into oc-mr1-dev am: 0d2d6b6a86 
am: 865c5fef38

Change-Id: I6691bb658052abcd3c8332019558b056312acb8c
 2017-10-15 03:08:12 +00:00
Zhi An Ng
b2a38b1ced Merge "Only show dialog if top app is killed" into oc-mr1-dev am: 4018898ae4 
am: 22681dc903

Change-Id: I61d2d40eb473022222ca1e6aff4c5a2487dec29f
 2017-10-15 03:03:06 +00:00
Hugo Benichi
e4cf6229f7 Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum" am: d098328585 am: 104b2bcc79 
am: 4071792cce

Change-Id: Id5ee94ae9a7e2a92289f2b25b0d5c0f0b5b7381a
 2017-10-15 02:53:58 +00:00
Tobias Thierer
8e60defe4b Merge "Update locked_region_code_injection tool to ASM 6.0-BETA." am: 26817938f6 
am: e69366ff27

Change-Id: Ieac3aadb7674ec63d4eed3d4d52f833e46d4a3a0
 2017-10-15 02:53:45 +00:00
Abodunrinwa Toki
8c11b48c38 Merge "Flags to enable/disable smart selection in EditText" into oc-mr1-dev am: 14ba6e10c0 
am: 2a86655b42  -s ours

Change-Id: Id0c3f6299e09e13811426e787893417dcc48ef17
 2017-10-15 02:49:47 +00:00
Wileen Chiu
9778539847 Merge "Add change to show Invalid card when erroneous card is inserted." am: 4bc825aecc 
am: 8279494137

Change-Id: Ibd676d4d0f7b8d285c8c01769dc0686358f3a13d
 2017-10-15 02:47:23 +00:00
Mathieu Chartier
b5d060c28e Merge "Add android.os.Parcel$ReadWriteHelper to compiled classes" into oc-mr1-dev am: 5b4d0e0404 
am: ba714b38a2

Change-Id: I4d827ef35fe511adb05ffca18e7da0d06218d414
 2017-10-15 02:43:19 +00:00
Colin Cross
3f6bef874e Merge "Convert ext.jar to Android.bp" am: 42156f3e56 am: 8feea076a2 
am: faededa6af

Change-Id: I9e640ea1f6175306c74075e25485bce622d6ca52
 2017-10-15 02:43:13 +00:00
Hugo Benichi
4071792cce Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum" am: d098328585 
am: 104b2bcc79

Change-Id: Ie935c7df75b95afff7b2817df35afe4798e91813
 2017-10-15 02:38:58 +00:00
Tobias Thierer
e69366ff27 Merge "Update locked_region_code_injection tool to ASM 6.0-BETA." 
am: 26817938f6

Change-Id: I193d04b7a4ebf0f39f60ac275a7eeb93499ded9d
 2017-10-15 02:38:05 +00:00
Wileen Chiu
8279494137 Merge "Add change to show Invalid card when erroneous card is inserted." 
am: 4bc825aecc

Change-Id: I89a5b529033c30defacc715ef3c8310500e5fae7
 2017-10-15 02:32:25 +00:00
Mathieu Chartier
ecc8bdc227 Merge "Add property reading logic for dalvik.vm.madvise-random" into oc-mr1-dev 
am: a354ec973d

Change-Id: Ic75411af539a08e215b5c9e076688fd39b46569d
 2017-10-15 02:31:19 +00:00
Hugo Benichi
104b2bcc79 Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum" 
am: d098328585

Change-Id: I1cbe45eb339903630675713d287e3375c7c98e62
 2017-10-15 02:24:52 +00:00
Winston Man
865c5fef38 Merge "Update CtsShim with multiArch" into oc-mr1-dev 
am: 0d2d6b6a86

Change-Id: Idcaf213ed1e081c816f1e6a8fa8a1650f6b04265
 2017-10-15 02:22:06 +00:00
Colin Cross
faededa6af Merge "Convert ext.jar to Android.bp" am: 42156f3e56 
am: 8feea076a2

Change-Id: I7db0fc0e79fdc0301f80b45c2001ec55031b137e
 2017-10-15 02:19:40 +00:00
Zhi An Ng
22681dc903 Merge "Only show dialog if top app is killed" into oc-mr1-dev 
am: 4018898ae4

Change-Id: I01bb75704d262cccce0f97aeb13de2ba02ace2f0
 2017-10-15 02:17:20 +00:00
Abodunrinwa Toki
2a86655b42 Merge "Flags to enable/disable smart selection in EditText" into oc-mr1-dev 
am: 14ba6e10c0

Change-Id: I0ddb7b827ad8b0be37c7e1adc5a95493bd35d61f
 2017-10-15 02:11:46 +00:00
Patrik Torstensson
23a3f240c0 Merge "Incorporate slab reclaimable into meminfo" into oc-mr1-dev am: 20fb01eb23 
am: 7528452f57

Change-Id: I46c0b4b07044578fe300aaf587973a650628388b
 2017-10-15 02:09:14 +00:00
Colin Cross
8feea076a2 Merge "Convert ext.jar to Android.bp" 
am: 42156f3e56

Change-Id: I44443e9095c8b527ebb42d11a6f5369fdf3e5d05
 2017-10-15 02:06:20 +00:00
Mathieu Chartier
ba714b38a2 Merge "Add android.os.Parcel$ReadWriteHelper to compiled classes" into oc-mr1-dev 
am: 5b4d0e0404

Change-Id: I08773b81acdf9f7c16be246ba056b9f8f54b4e6c
 2017-10-15 02:06:02 +00:00
Pankaj Kanwar
0e0a22e169 Merge "Merge "Cleanup of Cellular/Wifi aggregate statistics" into oc-mr1-dev am: eb98edfb83" into oc-mr1-dev-plus-aosp 
am: c623db3d98

Change-Id: I5512c904eb29e2819358299df36f7a1c2c261992
 2017-10-15 02:02:47 +00:00
TreeHugger Robot
0ae8b97ba7 Merge "Import translations. DO NOT MERGE" 2017-10-14 19:44:53 +00:00
TreeHugger Robot
c7c0519618 Merge "Add signature permission to allow access to shortcuts for sysui" 2017-10-14 03:21:50 +00:00
TreeHugger Robot
8e1c391791 Merge "AAPT2: Flatten AndroidManifest.xml stringpool in UTF16" 2017-10-14 02:40:16 +00:00
Bill Yi
d641843863 Import translations. DO NOT MERGE 
Change-Id: I11e09d4501fed09201362b2fb4d194330c5a72e2
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
 2017-10-13 18:17:32 -07:00
Zhizhou Yang
990735ee4c Merge "Enable PGO for hwui" 2017-10-14 01:13:55 +00:00
Makoto Onuki
634cecb899 Add signature permission to allow access to shortcuts for sysui 
Bug 34715012
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutManagerTestCases
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutHostTestCases

Change-Id: I922f9fb872e27b25d1016b3894165a0e63faa9b5
 2017-10-13 17:36:42 -07:00
TreeHugger Robot
13dccdbb7a Merge "Remove WifiNetworkScoreCache fake" 2017-10-14 00:20:23 +00:00
Winson Chung
29eea40277 Merge changes Id963434f,I103ccc69,I770cd430 
* changes:
  Remove events bus code from task loading code.
  Pull out TaskStackListener into its own class.
  Remove unused recents fast-toggle/paging code.
 2017-10-13 23:45:55 +00:00
TreeHugger Robot
04281fe36e Merge "PowerUI: Update temperature warnings on thermal throttling events" 2017-10-13 23:39:18 +00:00
Calin Juravle
4618f1e2eb Merge "[framework] Add check that classpath is up to date to getDexOptNeeded" 2017-10-13 22:59:06 +00:00
David Chen
f12b5c6789 Removes redundant RefBase inheritance. 
PackageInfoListener already inherits from RefBase, so the
MetricsProducer doesn't need it also.

Test: Not needed.
Change-Id: I27fc4c214251ba07fefeacf76549a80c8368ffa5
 2017-10-13 15:57:48 -07:00
Mathieu Chartier
a354ec973d Merge "Add property reading logic for dalvik.vm.madvise-random" into oc-mr1-dev 2017-10-13 22:28:23 +00:00
TreeHugger Robot
05b4d48094 Merge "Fix an unnecessary dependency (framework => health@2.0-java)" 2017-10-13 22:13:54 +00:00
Bryce Lee
d09afdc4cd Merge "ActivityStarter cleanup" 2017-10-13 22:12:24 +00:00
TreeHugger Robot
b19cfe6a54 Merge "AAPT2: Update SDK development codename to P" 2017-10-13 21:27:52 +00:00
Winson Chung
0f5120f3ba Remove events bus code from task loading code. 
- Remove extra class RecentsPackageMonitor, just have RecentsActivity drive
  the event itself.

Bug: 67510855
Test: Remove package while Recents is open, ensure activity infos are
      trimmed

Change-Id: Id963434ff868e607fe90ef770e4ba2070905cfba
 2017-10-13 14:25:30 -07:00
Winson Chung
2db3557064 Pull out TaskStackListener into its own class. 
Bug: 67510855
Test: Code removal
Change-Id: I103ccc690f577dbeba9c3568614d9f4041fff7df
 2017-10-13 14:25:26 -07:00
Todd Poynor
fb95e121d8 PowerUI: Update temperature warnings on thermal throttling events 
Subscribe to thermal throttling start/stop events from thermalservice,
if the vendor thermal management subsystem supports push notifications
of throttling events.  Update temperature warnings immediately when
throttling start/stop events are received.

Fixup existing comment to reflect current code regarding default warning
temperature value.

Bug: 66698613
Test: PowerNotificationWarningsTest, PowerUITest,
      manual: taimen with artificially low temperature threshold and
      logcat debugging messages

Change-Id: I021bcd0d06af861fd3a18a1790815a836659cee6
 2017-10-13 14:22:29 -07:00