drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
379,762 Commits 1 Branch 0 Tags
Commit Graph

379762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
c8e008b0b4 Merge "Merge "Introduce getRssi() in CellSignalStrengthLte" am: 5bdf255e0d am: e819bd7a1e" into pi-dev-plus-aosp 2018-11-09 22:48:04 +00:00
Shuo Qian
61db02b01a Merge "Introduce getRssi() in CellSignalStrengthLte" am: 5bdf255e0d 
am: e819bd7a1e

Change-Id: I77c5ba0bf87afde281473134a306595c052820cc
 2018-11-09 14:47:08 -08:00
Tej Singh
6752e11cdc Merge "Thermal shutdown fix: cool down on writing to disk" into pi-dev 
am: 0cc63ef090

Change-Id: Ieb9fe51c3a729413a1aa7f0c044246eb1c7c836c
 2018-11-09 14:41:26 -08:00
Shuo Qian
e819bd7a1e Merge "Introduce getRssi() in CellSignalStrengthLte" 
am: 5bdf255e0d

Change-Id: I39c693f5d463ab1d315c94802a3e9b17923c6508
 2018-11-09 14:21:37 -08:00
Shuo Qian
5bdf255e0d Merge "Introduce getRssi() in CellSignalStrengthLte" 2018-11-09 22:07:50 +00:00
TreeHugger Robot
0cc63ef090 Merge "Thermal shutdown fix: cool down on writing to disk" into pi-dev 2018-11-09 21:59:32 +00:00
Jong Wook Kim
358ff5d2bf Merge "Add WIFI_ENABLED and WIFI_DISABLED to StaEvent" into pi-dev 
am: f3375f360e

Change-Id: I7bb7027ef986e087fec2e3726eb91f930ce9d6c7
 2018-11-09 13:40:25 -08:00
Jong Wook Kim
f3375f360e Merge "Add WIFI_ENABLED and WIFI_DISABLED to StaEvent" into pi-dev 2018-11-09 21:16:38 +00:00
Robert Carr
e840014762 Merge "DO NOT MERGE Make stop complete notification call in to ActivityManager blocking." into pi-dev 
am: b71d950932

Change-Id: Ifae20ab099be12674e643c1b6331ec689c286f28
 2018-11-09 13:12:13 -08:00
Tejinder Singh
ba7af6259d Merge "Pixel Thermal Throttling: fix throttling constants." into pi-dev 
am: 3ebd957c25

Change-Id: Icf02af585e14047754c2e212dd0f24066eb027cb
 2018-11-09 13:06:33 -08:00
TreeHugger Robot
b71d950932 Merge "DO NOT MERGE Make stop complete notification call in to ActivityManager blocking." into pi-dev 2018-11-09 20:45:57 +00:00
Chenbo Feng
d7a976a55c Merge "Rename android bpf library" am: cfcb33cb32 
am: 0ba8701f5c

Change-Id: Id9215d3dd6caa5b9b100a02f1972859179212317
 2018-11-09 12:40:46 -08:00
TreeHugger Robot
3ebd957c25 Merge "Pixel Thermal Throttling: fix throttling constants." into pi-dev 2018-11-09 20:38:55 +00:00
Tej Singh
42f9e06418 Thermal shutdown fix: cool down on writing to disk 
Currently, statsd uses wall clock seconds to write data to disk. This
issue affects both thermal and normal shutdowns, because if two writes
occur in the same second, the more recent write will overwrite the older
write, erasing the actual data that we want.

For thermal shutdowns, we write twice. Once because of termination
signal received, and once because of binder death recipient from
statscompanion service.

For normal clean shutdowns, we write 3 times. In addition to the two
above, we write for the shutdown received signal.

This fix introduces a cool down period of 3 seconds between writing to
disk.

Bug: 112432890
Test: statsd unit tests
Test: statsd cts tests
Test: manually verified normal shutdown had 1 file written to disk
Test: manually verified thermal shutdown had 1 file written to disk
Change-Id: I4cd39de9063935e762ff7d00051ccc915f31e89a
 2018-11-09 20:37:42 +00:00
Chenbo Feng
0ba8701f5c Merge "Rename android bpf library" 
am: cfcb33cb32

Change-Id: Iac5309bbe8b7669b31cc490461daeda4978f37f9
 2018-11-09 12:26:25 -08:00
Treehugger Robot
cfcb33cb32 Merge "Rename android bpf library" 2018-11-09 20:06:41 +00:00
Todd Kennedy
aefe6b57a8 [automerger skipped] Merge "Revert "Fix the icon overlay after density change"" into pi-dev 
am: e59ce289b7  -s ours

Change-Id: Ied00608b3b454d8ebe8b7a5438000a07e76d8c6e
 2018-11-09 11:19:01 -08:00
Todd Kennedy
e59ce289b7 Merge "Revert "Fix the icon overlay after density change"" into pi-dev 2018-11-09 18:39:52 +00:00
Todd Kennedy
2d80eb4425 Merge "Revert "resolve merge conflicts of 0cc0d229d0f590fe84c1b7aa8cc8fbf188d8a787 to pi-dev-plus-aosp"" into pi-dev-plus-aosp 2018-11-09 18:39:28 +00:00
Todd Kennedy
166363d897 Revert "Fix the icon overlay after density change" 
This reverts commit 252efd708aa042b98b6087fc12a7dc0140a9ca21.

Reason for revert: breaks git_pi-dev-plus-aosp build

Change-Id: Icbccc53a6b860fab17fefcfe54a72b80957482e4
 2018-11-09 18:38:17 +00:00
Todd Kennedy
b2f48af230 Revert "resolve merge conflicts of 0cc0d229d0f590fe84c1b7aa8cc8fbf188d8a787 to pi-dev-plus-aosp" 
This reverts commit 6fa357a529a57d0421df6070d425ccc684603ef0.

Reason for revert: breaks git_pi-dev-plus-aosp build

Change-Id: I12697f8c329ab224f83856176ba989c37920774f
 2018-11-09 18:38:07 +00:00
Selim Cinek
7a6f5c4b01 Merge "resolve merge conflicts of 0cc0d229d0f590fe84c1b7aa8cc8fbf188d8a787 to pi-dev-plus-aosp" into pi-dev-plus-aosp 2018-11-09 17:30:28 +00:00
Felka Chang
6fa357a529 resolve merge conflicts of 0cc0d229d0f590fe84c1b7aa8cc8fbf188d8a787 to pi-dev-plus-aosp 
To add test testHeaderReadFromOldController into
HeadsUpAppearanceControllerTest.java and conflict with
testOperatorNameViewUpdated.

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: If7d7961dbc12346484f3d139bdc808a53abc6c46
 2018-11-09 17:29:40 +00:00
Calvin Pan
41ad850c96 Merge "Add CarrierId column in TelephonyProvider" am: 1df5ca6a71 
am: dfed97ba6d

Change-Id: I89d20cb9ca28ad4fb26fbbf5cf2ba81985fa71ba
 2018-11-09 06:02:41 -08:00
Paul Duffin
f82d01d16f Merge "Remove android.icu.... classes from light grey list" am: c6b17ad431 
am: 1519c387e7

Change-Id: If1d84299aada7dd3f86d4006a781e9af7a1baaa7
 2018-11-09 05:51:34 -08:00
Calvin Pan
dfed97ba6d Merge "Add CarrierId column in TelephonyProvider" 
am: 1df5ca6a71

Change-Id: I35fc941a9e7b1dace0b1572976dd854227e434a5
 2018-11-09 05:49:05 -08:00
Paul Duffin
1519c387e7 Merge "Remove android.icu.... classes from light grey list" 
am: c6b17ad431

Change-Id: I932de80765875d860ec69872dc2d9f9a26ffd173
 2018-11-09 05:40:42 -08:00
Calvin Pan
1df5ca6a71 Merge "Add CarrierId column in TelephonyProvider" 2018-11-09 13:30:51 +00:00
Paul Duffin
c6b17ad431 Merge "Remove android.icu.... classes from light grey list" 2018-11-09 13:24:17 +00:00
Alan Stokes
0a0559c0ce Merge "DexLoadReporter needs to handle arbitrary class loaders." am: f2d5ace011 
am: 1e29264790

Change-Id: I41caab25c48d496722ac4d044908dd781df1705d
 2018-11-09 03:20:40 -08:00
Alan Stokes
1e29264790 Merge "DexLoadReporter needs to handle arbitrary class loaders." 
am: f2d5ace011

Change-Id: Ic54d9729d8a1bd2e24b1ab8ddfa4eeda089e3fbe
 2018-11-09 03:10:06 -08:00
Treehugger Robot
f2d5ace011 Merge "DexLoadReporter needs to handle arbitrary class loaders." 2018-11-09 11:02:20 +00:00
Junyu Lai
9c10dcc0f1 Merge "Use spy in PermissionMonitorTest." am: df01b11de1 
am: 999733c5fa

Change-Id: I9eac5d82c0b5e3eb5593407aa2eb82cb8c71dc2e
 2018-11-09 01:11:47 -08:00
Junyu Lai
999733c5fa Merge "Use spy in PermissionMonitorTest." 
am: df01b11de1

Change-Id: I6074b6fb2f90821ddad93db18fbb633225b4292f
 2018-11-09 01:01:25 -08:00
Junyu Lai
df01b11de1 Merge "Use spy in PermissionMonitorTest." 2018-11-09 08:47:03 +00:00
Sudheer Shanka
f604b8b688 Merge "Fix adb shell cmd activity get-config --proto --device fail" am: c0dd0d6648 
am: bb5384dbd0

Change-Id: If3950a91cfa8783fc62c322d2d3911124dc93093
 2018-11-08 22:34:33 -08:00
Sudheer Shanka
bb5384dbd0 Merge "Fix adb shell cmd activity get-config --proto --device fail" 
am: c0dd0d6648

Change-Id: Ic21b3091d47cd65cfa36b26cfeb00042255b91ec
 2018-11-08 22:20:14 -08:00
Sudheer Shanka
c0dd0d6648 Merge "Fix adb shell cmd activity get-config --proto --device fail" 2018-11-09 06:08:23 +00:00
junyulai
345155e8b4 Use spy in PermissionMonitorTest. 
Bug: 118811303
Test: runtest frameworks-net
Change-Id: Id61a9efecf1d1ed5a9045b78ecfec9239e13967b
 2018-11-09 12:37:16 +08:00
Hall Liu
d96fd15364 Merge "Fix flaky AnalytisTest by locking in EventRecord" am: 0a390095df 
am: e90962ff1d

Change-Id: Ifa04c8d827c3ce9c34454115fcb45ed092377dda
 2018-11-08 18:40:29 -08:00
TreeHugger Robot
0cc0d229d0 Merge "Fix the icon overlay after density change" into pi-dev 2018-11-09 02:33:59 +00:00
Vishnu Nair
ba8d3d6109 Merge "[DO NOT MERGE] AM: Fix invalid hot launch app metrics seen with quickstep" into pi-dev 
am: bdba80d907

Change-Id: Ie12322f3e103fa7fee9eec05b7b4970af6414a82
 2018-11-08 18:33:06 -08:00
Hall Liu
e90962ff1d Merge "Fix flaky AnalytisTest by locking in EventRecord" 
am: 0a390095df

Change-Id: I81001dc60def2165a8083a457559ec2ea1548d91
 2018-11-08 18:31:49 -08:00
TreeHugger Robot
bdba80d907 Merge "[DO NOT MERGE] AM: Fix invalid hot launch app metrics seen with quickstep" into pi-dev 2018-11-09 02:23:35 +00:00
Hall Liu
0a390095df Merge "Fix flaky AnalytisTest by locking in EventRecord" 2018-11-09 02:21:56 +00:00
Eric Holk
b6d1454fe3 Merge "[view_compiler] Add end-to-end DexBuilder tests" am: 60b722a005 
am: 66f78192a9

Change-Id: I5e6b5aa9b839206c8d6026d8f96ef90f1d73e80f
 2018-11-08 17:30:34 -08:00
weijuncheng
1203000809 Fix adb shell cmd activity get-config --proto --device fail 
Root cause:
If the system features got from pm.getSystemAvailableFeatures() have some features with no name,
it may cause adb shell cmd activity get-config --proto --device fails, the second parameter
in the compator should also be judged with o2.name == null

Bug: 118662777

Test: run cts  -m CtsActivityManagerDeviceTestCases
               -t android.server.am.ActivityManagerGetConfigTests#testDeviceConfig


Change-Id: Iee22cdf2e69104d3d9480971655b0be66ff84e46
Signed-off-by: weijuncheng <weijuncheng@xiaomi.com>
 2018-11-09 01:22:13 +00:00
Youming Ye
7e9dd747a8 Merge "Add possibility to configure SPN during Wi-Fi Calling and Flight mode" am: 777235c467 
am: ecf6966392

Change-Id: I44684992b63a472c211cd504fe506d0b71bf5386
 2018-11-08 17:21:50 -08:00
Eric Holk
66f78192a9 Merge "[view_compiler] Add end-to-end DexBuilder tests" 
am: 60b722a005

Change-Id: I86c5f92c4ec53919a96540f4568e1b602b26c350
 2018-11-08 17:19:10 -08:00
Youming Ye
ecf6966392 Merge "Add possibility to configure SPN during Wi-Fi Calling and Flight mode" 
am: 777235c467

Change-Id: If9c175fdca9e0ee4c5cee74773f254c95d3bb328
 2018-11-08 17:11:21 -08:00