Commit Graph

9270 Commits

Author SHA1 Message Date
TreeHugger Robot
2792c7f6a2 Merge "Do not check isPortait on null mediaSize" 2018-02-15 21:08:25 +00:00
Calin Juravle
aedf031b21 Merge "Pass the compilation reason to dexopt" 2018-02-15 20:45:03 +00:00
TreeHugger Robot
e4adba745b Merge changes from topic "telus"
* changes:
  SUPL server for Telus
  New cellular network types
2018-02-15 18:04:59 +00:00
Rebecca Silberstein
e371d1c0ae Add OWNERS for wifi/connectivity related files
Added OWNERS for the wifi dir under frameworks base and per-file owners
for wifi/connectivity related files in internal util

BUG: 73403966
Test: none
Change-Id: I7319394d4b02e6dcfa566192b2822cfc47e72926
2018-02-14 23:11:23 -08:00
Calin Juravle
4bc8f4daf3 Pass the compilation reason to dexopt
Record the compilation reason in the oat files to enable better
performance monitoring.

Test: DexoptOptionsTest
      manual
Bug: 73102540

Change-Id: Ifa487d4bc33dcd06f12af6bdd1d9a9c5f4562f4b
2018-02-14 13:26:04 -08:00
Philip P. Moltmann
2ec6657362 Do not check isPortait on null mediaSize
If the mediaSize is null isPortrait causes a NPE, hence don't check it.

Test: adb shell dumpsys print
Fixes: 73126770
Change-Id: I98cfcfc79bac20ee2f1a2aee0f032d7e34075274
2018-02-14 12:33:39 -08:00
Sudheer Shanka
9bed261a30 Merge "Update BatteryStats cpustats collection to be asynchronous." 2018-02-14 18:34:59 +00:00
TreeHugger Robot
2b0d4b0b54 Merge "Zen upgrade notification" 2018-02-14 00:27:05 +00:00
David Brazdil
145ecabda2 Merge "Refactor runtime hidden API flag from negative to positive" 2018-02-14 00:10:28 +00:00
Sudheer Shanka
f7431febe0 Merge "Update the internal state before sending the deltas to callback." 2018-02-13 23:44:56 +00:00
Beverly
3bae4e5d86 Zen upgrade notification
Test: runtest --path /extra/master/frameworks/base/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java
Change-Id: Ia31f89af74d9bcee40e050bd6cc13f1e6a9a15d9
Fixes: 73000503
Fixes: 72876890
Fixes: 73110052
2018-02-13 17:29:59 -05:00
Sudheer Shanka
125e4ec2dd Merge "check if per-uid cputimes proc file has correct no. of freqs." 2018-02-13 21:04:08 +00:00
TreeHugger Robot
e9f70acf05 Merge "Fix timeouts caused by destroy() waiting for the same lock on sort." 2018-02-13 20:44:42 +00:00
Sudheer Shanka
c57729adae Update BatteryStats cpustats collection to be asynchronous.
- Collect cpu times info asynchronously when the screen state changes.
- Remove the redundant cpu collection during the battery state handling.
- Fix BatteryStatsNoteTest failing because of http://b/70808931

Bug: 70563832
Bug: 69054238
Test: atest hostsidetests/incident/src/com/android/server/cts/BatteryStatsValidationTest.java
Test: atest core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Test: atest core/tests/coretests/src/com/android/internal/os/BstatsCpuTimesValidationTest.java
Change-Id: Ic6441d45f94dc0703b8adc03cb8d3ab5f877626d
2018-02-13 12:27:50 -08:00
Siddharth Ray
c72081d762 New cellular network types
New cellular network types (cellular data registration states) are added.

When cellular network type is "IWLAN" and the phone is on, call is VoWifi.
The only exception is when the following conditions hold
- Verizon sim card
- 1x coverage only
- Wifi is connected
In this case calls go over cellular (cdma 1x).

BUG:67013665

Test: Manual
Change-Id: Id90445c899547bdac003a2cbbfa8cd78060750f2
2018-02-13 12:12:16 -08:00
David Brazdil
f7e31c0a2b Refactor runtime hidden API flag from negative to positive
There are only two situations in which we want to enable hidden API
access flag checks. Turning the flag from DISABLE_ to ENABLE_
simplifies logic in ART and reduces the number places where the flag
had to be passed down to ART.

Bug: 64382372
Test: boot device, install and run apps, check log messages
Change-Id: Ic5a531834360b614fc93d54221c7395579791184
2018-02-13 18:36:51 +00:00
hansson
38a5423c70 Merge "fix misleading FATAL EXCEPTION IN SYSTEM PROCESS log" am: c0c9f53175 am: 78d15fd15a
am: 927afd1edf

Change-Id: I7c90804ed55df27244a25fe0e9075c4ec2147e74
2018-02-13 16:49:00 +00:00
hansson
927afd1edf Merge "fix misleading FATAL EXCEPTION IN SYSTEM PROCESS log" am: c0c9f53175
am: 78d15fd15a

Change-Id: Ie90bccf5aa5fb67e1b4769fcbb1013b1fae71063
2018-02-13 16:39:33 +00:00
yuanhuihui
e669ac2520 fix misleading FATAL EXCEPTION IN SYSTEM PROCESS log
There will be the following situations about mApplicationObject:

1) fork app process will invoke ActivityThread.main(),
then set mApplicationObject.

2) fork system_server, don't set mApplicationObject value.

3) using app_process fork process except zygote, will inovke RuntimeInit,
don't set mApplicationObject value。

For example using command as below:
app_process /system/bin com.android.commands.am.Am "$@",

if this process throw uncaught exception,will output FATAL EXCEPTION IN SYSTEM PROCESS log,
it's not in system process but in normal process。

so should add condition: Process.SYSTEM_UID == Process.myUid()

BUG: 72759350
Test: manual

Change-Id: Ie8d769e4149cd9b938577058de871c4f8db9efe5
Signed-off-by: yuanhuihui <yuanhuihui@xiaomi.com>
2018-02-13 12:52:38 +00:00
Sudheer Shanka
318a67d81f Update the internal state before sending the deltas to callback.
It's possible that the callback can trigger removing the cpu time
correspoding to a particular uid, we don't want to re-add the state
for that uid after this.

Fixes: 63144979
Test: cts-tradefed run singleCommand cts-dev -m CtsIncidentHostTestCases -t \
      com.android.server.cts.BatteryStatsValidationTest

Change-Id: I29f208ea5cb18f05ad16dfc22f8dea077cc186fb
2018-02-12 16:57:23 -08:00
TreeHugger Robot
bf3248fda9 Merge "Update internal ViewPager's SavedState to match Support Library version" 2018-02-10 00:49:02 +00:00
Alan Viverette
e64a80cc16 Update internal ViewPager's SavedState to match Support Library version
Fixes: 71992105
Test: no
Change-Id: Ic4569b21d8a26a62bba91742b442f0c3ea8bcc9e
2018-02-09 17:39:20 -05:00
Kang Li
e3b4710524 Fix timeouts caused by destroy() waiting for the same lock on sort.
Bug: 72458997
Test: manually reproduced error and verified that it is fixed with this
code change on a Taimen.

Change-Id: I03ddbc8a1b3cfb6f720413248cc5813458d35851
2018-02-09 11:53:26 -08:00
Anton Hansson
35a9e99c8f Upload tombstone with the system_server_native_crash tag.
This allows monitoring system server native crashes separately from
all the other native crashes.

Note that this now double-reports native crashes in system server,
once with SYSTEM_TOMBSTONE tag and once with the
system_server_native_crash tag. This can likely be cleaned up to
only report the latter, once it's been verified to work.

Test: "ls /data/system/dropbox" after triggering a native SS crash.
Bug: 63172851
Change-Id: Ib09275b53627c0219e2f74ea2ab102575f9b33c0
2018-02-09 11:54:52 +00:00
TreeHugger Robot
efd14bf5a5 Merge "Wireless charging on aod and lockscreen" 2018-02-08 23:46:15 +00:00
TreeHugger Robot
40279e5407 Merge changes I6993325b,Icb5114fe
* changes:
  Frameworks: Annotate trivial @GuardedBy in services/core
  Frameworks: Annotate trivial @GuardedBy in core/java
2018-02-08 23:32:03 +00:00
TreeHugger Robot
4d0e87d926 Merge "Fix context submenu position" 2018-02-08 21:23:26 +00:00
TreeHugger Robot
6a00aac93a Merge "Cellular Tx power added to Volta historian" 2018-02-08 18:34:45 +00:00
Beverly
ac32c9acc3 Wireless charging on aod and lockscreen
- wireless charging animation plays on aod + lockscreen
- timing changes on animation based on design spec
- charging feedback only given if phone is not just booted

Test: manual
Bug: 67598445
Change-Id: I009ff6016141bcdfe9f0392bb9a1c220ea88dfe5
2018-02-08 09:38:59 -05:00
Narayan Kamath
3fc6aca9bf Merge "BatteryStatsNoteTest: Fix GPS related tests." 2018-02-08 12:40:48 +00:00
Andreas Gampe
3f24e69dbe Frameworks: Annotate trivial @GuardedBy in core/java
Add @GuardedBy for simple functions that require a single lock
and are named XYZLocked.

Bug: 73000847
Test: m
Test: m javac-check-framework RUN_ERROR_PRONE=true
Change-Id: Icb5114fea2ff2385e1cc7511121026099e05c0ee
2018-02-08 02:19:42 -08:00
Rubin Xu
9355b421f2 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97 am: f097744926 am: 469065ccb7 am: bf1ecab901 am: 7ac2108ed3 am: a7483c90c1
am: 0cc5170801

Change-Id: Iaff68c3cd8a58d55ccdaee13f37392c3cb546b2b
2018-02-07 22:54:47 +00:00
Rubin Xu
0cc5170801 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97 am: f097744926 am: 469065ccb7 am: bf1ecab901 am: 7ac2108ed3
am: a7483c90c1

Change-Id: I04733e3924d0530300106f5897771adf8a4db391
2018-02-07 22:31:21 +00:00
Rubin Xu
a7483c90c1 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97 am: f097744926 am: 469065ccb7 am: bf1ecab901
am: 7ac2108ed3

Change-Id: Ibae4cb0462cfcbc2296e71849387d0c0035d3cce
2018-02-07 22:14:48 +00:00
Rubin Xu
7ac2108ed3 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97 am: f097744926 am: 469065ccb7
am: bf1ecab901

Change-Id: Ibf8e444ab8e66a068174c30985e3056443db99fe
2018-02-07 21:59:55 +00:00
Siddharth Ray
f5e796a070 Cellular Tx power added to Volta historian
A flag in historian is added to identify time periods where the
cellular radio is transmitting at the highest power level.

BUG:38354995
Change-Id: Ib89a505636c1d5aa66f8c19690742dde9d40fe61
2018-02-07 12:29:26 -08:00
Narayan Kamath
efa0fe6b3e BatteryStatsNoteTest: Fix GPS related tests.
Bug: N/A
Test: BatteryStatsTests
Change-Id: Icadf17a3839d96559f824e45babdbf794a92456c
2018-02-07 13:08:52 +00:00
Narayan Kamath
b5bca1dc92 Merge "BatteryStats : Remove unused upTime parameter." 2018-02-07 11:18:25 +00:00
Narayan Kamath
fb166de438 Merge "BatteryStats: Remove empty conditional." 2018-02-07 11:17:16 +00:00
Siyuan Zhou
dd98087d56 Merge "BootReceiver: changed deprecated Build.RADIO to Build.getRadioVerison to get non-empty radio firmware version in SYSTEM_LAST_KMSG." am: 1a535ba4b9 am: 1801988051
am: 11942417b2

Change-Id: Idb7b94a6f07334184e4be5088e2b4e50183d3600
2018-02-07 08:52:04 +00:00
Android Build Merger (Role)
bf1ecab901 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97 am: f097744926 am: 469065ccb7
Change-Id: I9af74b6a8fd17dbc9c8c1edebc0db81a07d2e8dc
2018-02-07 08:19:03 +00:00
Android Build Merger (Role)
469065ccb7 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97 am: f097744926
Change-Id: Ic3e36a94f5c7b3cf33b8c7972fc1bd254be9a31c
2018-02-07 08:18:57 +00:00
Android Build Merger (Role)
f097744926 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97
Change-Id: Ic3b71eb297425e9ff6d40c542aa67027317dffea
2018-02-07 08:18:50 +00:00
Android Build Merger (Role)
4af59f1c97 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483
Change-Id: Ie3d39f4c402d3385f45aca01059f03ef4025855f
2018-02-07 08:18:44 +00:00
Android Build Merger (Role)
ab36ba8483 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2
Change-Id: I76a950ed4296cad67230c36ee9edc0b7cc905c60
2018-02-07 08:18:37 +00:00
Android Build Merger (Role)
b3012285e2 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2
Change-Id: I7c984a83858ee5bb0b84d122dac27e0273f0a177
2018-02-07 08:18:22 +00:00
Android Build Merger (Role)
4405b0ced2 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f
Change-Id: Ib6d585953a35d3d00ab51144af7639c851ac3d72
2018-02-07 08:18:15 +00:00
Android Build Merger (Role)
83cb35453f [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d
Change-Id: I060b6306f3f53b4497b6a19d7221aa1938e66f55
2018-02-07 08:18:09 +00:00
Android Build Merger (Role)
0231bc4d6d [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888
Change-Id: Ib1b60818cddeefe3031cf6c9880f5b790775aa62
2018-02-07 08:18:02 +00:00
Rubin Xu
54813e9888 Fix VerifyCredentialResponse parcelling code
There was an asymmetry between parcelling and unparcelling of
VerifyCredentialResponse that could lead to type confusion if
packed with other objects in a Parcel.

Test: none
Bug: 71714464
Change-Id: Icff68879e249422ccca49f2bb7db85c35b4cb353
2018-02-07 08:17:06 +00:00