Commit Graph

9395 Commits

Author SHA1 Message Date
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
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
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
TreeHugger Robot
9ed872cefb Merge "*** BREAKING: Additional letters of the alphabet discovered! ***" 2018-02-07 04:38:19 +00:00
Siyuan Zhou
11942417b2 Merge "BootReceiver: changed deprecated Build.RADIO to Build.getRadioVerison to get non-empty radio firmware version in SYSTEM_LAST_KMSG." am: 1a535ba4b9
am: 1801988051

Change-Id: I6c9e33ae9fbec647ade9f4258aedfdf73f2883a2
2018-02-07 04:03:26 +00:00
TreeHugger Robot
3d0ea0d4eb Merge "Move CarServiceHelperService (again)" 2018-02-07 02:41:28 +00:00
Dan Sandler
93cb900678 *** BREAKING: Additional letters of the alphabet discovered! ***
Bug: 66985933
Change-Id: Iab7da2024320ac15bcfe2bf1b7d4638b00cd315c
Test: adb shell am start -n android/com.android.internal.app.PlatLogoActivity
2018-02-06 21:17:48 -05:00
Treehugger Robot
1a535ba4b9 Merge "BootReceiver: changed deprecated Build.RADIO to Build.getRadioVerison to get non-empty radio firmware version in SYSTEM_LAST_KMSG." 2018-02-07 01:24:36 +00:00
Selim Cinek
077e3042b8 Merge "Fixed an issue where we would access the wrong drawable" 2018-02-06 23:29:10 +00:00
Selim Cinek
0b45fa9e65 Fixed an issue where we would access the wrong drawable
Quick follow up fix the inline images

Test: add notification with image
Change-Id: I21c149b0cd63bc93895eee34be5e68d3caef0298
2018-02-06 15:24:25 -08:00
Selim Cinek
a352b7a9f3 Merge "Implemented support for inline images" 2018-02-06 23:15:00 +00:00
Steve Paik
94292a388c Move CarServiceHelperService (again)
Move CarServiceHelperService.java and ICarServiceHelper.aidl from
frameworks/base to frameworks/opt/car/services.

Bug: 72571496
Test: Complies and runs
Change-Id: I0f09c84e25a372dab3f170bd623f25a92f9b0f73
2018-02-06 11:55:10 -08:00
Selim Cinek
7199ed910e Implemented support for inline images
Messaging Style always had API support to
display images, but they were never shown.
We are now displaying images inline

Bug: 63708826
Test: send messages with an image
Change-Id: I50c835b19f4846cb2cbfb17e9805eacffd9ec6b3
2018-02-06 10:33:16 -08:00
Narayan Kamath
ddf96c0aac BatteryStats: Remove empty conditional.
This was accidentally left behind by change 8182202ac8 when the
statsd related logic was moved to the caller of the method in
question.

Test: make
Change-Id: I75f88aa239d84dfd57f64606059f41259b35c334
2018-02-06 13:26:46 +00:00
TreeHugger Robot
46de390f9c Merge "BatteryStats: Fix bogus calls to addHistoryRecordLocked." 2018-02-06 11:53:16 +00:00
TreeHugger Robot
db72e3b421 Merge "Ignore more yellows and greens" 2018-02-06 08:32:30 +00:00
TreeHugger Robot
cc2e2d46fb Merge "Add new InputBindResult.ResultCode for no editor" 2018-02-06 03:12:23 +00:00
Lucas Dupin
47e7cfd8b5 Ignore more yellows and greens
Updated palettes to ignore a broader range or yellows, greens
and adjacent colors.

Change-Id: Ied6c3ea0cb917a19548483a42d66f1f4b4fee4f7
Fixes: 68683213
Test: atest tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java
2018-02-05 17:23:42 -08:00