Commit Graph

448924 Commits

Author SHA1 Message Date
TreeHugger Robot
59e43a98f8 Merge "Remove a dead option" 2019-10-30 00:32:02 +00:00
Steven Liu
75641038d8 Merge "Add carrier ID field for WifiConfiguration and PasspointConfiguration" 2019-10-30 00:28:52 +00:00
TreeHugger Robot
2bbe7de417 Merge "Remove StartInputFlags.FIRST_WINDOW_FOCUS_GAIN" 2019-10-29 23:51:56 +00:00
Soonil Nagarkar
c7e12ea18e Merge "Fix remaining Handler mismatch" 2019-10-29 23:42:25 +00:00
Xiangyu/Malcolm Chen
87f24035c0 [automerger skipped] Merge changes from topic "am-499f522cabe64cbf9fa120abdbdf4831" into qt-qpr1-dev-plus-aosp
am: 78a2b61782 -s ours
am skip reason: change_id If086c50ae803b384691f709057bceeac2fc1d9d5 with SHA1 387dc0efd1 is in history

Change-Id: I66e67c4a085300d2fea3e58e6c45dbd1a4864189
2019-10-29 16:35:22 -07:00
Xiangyu/Malcolm Chen
53e1f6c13c [automerger skipped] Merge changes from topic "getDeviceCapableModemCount" am: 8ed3fb4bcf am: dd9d9fde68
am: 9ed67f1ba6 -s ours
am skip reason: change_id If086c50ae803b384691f709057bceeac2fc1d9d5 with SHA1 32f799da52 is in history

Change-Id: I3e0d043ac5dd0f2656227d85fe22c80c20505a00
2019-10-29 16:25:01 -07:00
Lucas Dupin
657c94298b Merge "Fix clock alpha when awake" into qt-qpr1-dev am: 5a7e009b8c
am: 95caf3907b

Change-Id: Ibb03a7dae910312bb29c9fede8a418dfa108cc45
2019-10-29 16:22:49 -07:00
Android Build Merger (Role)
78a2b61782 Merge changes from topic "am-499f522cabe64cbf9fa120abdbdf4831" into qt-qpr1-dev-plus-aosp
* changes:
  Merge changes from topic "getDeviceCapableModemCount" am: 8ed3fb4bcf am: dd9d9fde68
  Add public intent ACTION_MULTI_SIM_CONFIG_CHANGED. am: 64ff73fe4d am: 23aaf352ea
2019-10-29 23:17:50 +00:00
Xiangyu/Malcolm Chen
9ed67f1ba6 Merge changes from topic "getDeviceCapableModemCount" am: 8ed3fb4bcf
am: dd9d9fde68

Change-Id: I48303451f2ad1eeab2513ac5994de2b97649d82b
2019-10-29 16:15:58 -07:00
Malcolm Chen
05c8a179c8 Add public intent ACTION_MULTI_SIM_CONFIG_CHANGED. am: 64ff73fe4d
am: 23aaf352ea

Change-Id: I37561f740c57b60285d184e0882c95648c81d220
2019-10-29 16:15:48 -07:00
Lucas Dupin
95caf3907b Merge "Fix clock alpha when awake" into qt-qpr1-dev
am: 5a7e009b8c

Change-Id: If52e7eae135f1c977d498fa22d297cb056b71a06
2019-10-29 16:15:23 -07:00
Xiangyu/Malcolm Chen
dd9d9fde68 Merge changes from topic "getDeviceCapableModemCount"
am: 8ed3fb4bcf

Change-Id: I092ecb302852b4814fcef58084764e84bede154e
2019-10-29 16:09:15 -07:00
Malcolm Chen
23aaf352ea Add public intent ACTION_MULTI_SIM_CONFIG_CHANGED.
am: 64ff73fe4d

Change-Id: I94a1b7159ef656f2be20d6ecc1d0548479f0672a
2019-10-29 16:09:01 -07:00
Nick Chalko
00286967f2 Merge "Add OWNERS for media/tv files" am: c91c7ab339 am: a0f0da0bd1
am: 3a6f4226ca

Change-Id: Iefcca06ab0103f2d92b9564cd56fc819b617aec3
2019-10-29 16:04:48 -07:00
Jing Ji
17a5787101 Merge "Add test case for racing between process's death and service's stop" 2019-10-29 23:02:11 +00:00
Christian Wailes
40ef2f1694 [automerger skipped] Merge "Fixes a system crash in VibratorService on x86 hosts" am: 5ed0e55859 am: 5d8f3ae57d
am: 01676b2564 -s ours
am skip reason: change_id If50f68df9579f84bddc9d70a0a30cd73f4485e96 with SHA1 e2e5a31362 is in history

Change-Id: I8de0517621facad6f880685b67979d235a3fc815
2019-10-29 16:01:25 -07:00
Xiangyu/Malcolm Chen
8ed3fb4bcf Merge changes from topic "getDeviceCapableModemCount"
* changes:
  Rename and publicize getMaxPhoneCount; and deprecate getPhoneCount.
  Add public intent ACTION_MULTI_SIM_CONFIG_CHANGED.
2019-10-29 22:54:26 +00:00
TreeHugger Robot
20c14c401f Merge "Data/activation broadcasts use elapsed realtime" 2019-10-29 22:53:59 +00:00
Lucas Dupin
5a7e009b8c Merge "Fix clock alpha when awake" into qt-qpr1-dev 2019-10-29 22:53:39 +00:00
Jack Yu
9649db602f Merge "Addition of 'XorEqualsString' method for comparing String" am: e750b5b659 am: 000baa69f6
am: cbebaf2eb9

Change-Id: Id8b139aec8fb3e3bfc1db2fd304647264ba2a947
2019-10-29 15:53:17 -07:00
Nick Chalko
3a6f4226ca Merge "Add OWNERS for media/tv files" am: c91c7ab339
am: a0f0da0bd1

Change-Id: I75dbf8c9ecd9827b216933af11acef856cd3a6aa
2019-10-29 15:52:55 -07:00
Paul Duffin
5a6072c879 Merge "Ignore classes on the classpath when generating stubs" am: c817b66016 am: 275d3b5585
am: 2b0d8181b0

Change-Id: Ib4ea2b2bf97c4328006922dd850d07abecadeebf
2019-10-29 15:49:34 -07:00
Christian Wailes
01676b2564 Merge "Fixes a system crash in VibratorService on x86 hosts" am: 5ed0e55859
am: 5d8f3ae57d

Change-Id: Ic699d40f08f65c5b0731dfc75c13f42cd8b3c66a
2019-10-29 15:49:04 -07:00
TreeHugger Robot
bfe971e67e Merge "[wm]: Fixed layout problem in PolicyControl immersive mode" 2019-10-29 22:44:56 +00:00
Jack Yu
cbebaf2eb9 Merge "Addition of 'XorEqualsString' method for comparing String" am: e750b5b659
am: 000baa69f6

Change-Id: I1f85966f9a430e78e784b527771f4b5ce80e5289
2019-10-29 15:40:32 -07:00
Nick Chalko
a0f0da0bd1 Merge "Add OWNERS for media/tv files"
am: c91c7ab339

Change-Id: Ibe22561aca8dc5c2f0c21c843607ffd5c6b1cbfb
2019-10-29 15:39:50 -07:00
Christian Wailes
5d8f3ae57d Merge "Fixes a system crash in VibratorService on x86 hosts"
am: 5ed0e55859

Change-Id: I6ad532b24ba56d7e55aead79f8d59782339d4388
2019-10-29 15:35:54 -07:00
Paul Duffin
2b0d8181b0 Merge "Ignore classes on the classpath when generating stubs" am: c817b66016
am: 275d3b5585

Change-Id: Iae5798157a855f3a7b3e699ccc2cb0b52d80641e
2019-10-29 15:35:40 -07:00
TreeHugger Robot
d5003e2bed Merge "DisplayTransformManager: use a single SurfaceFlinger handle" 2019-10-29 22:34:34 +00:00
Treehugger Robot
c91c7ab339 Merge "Add OWNERS for media/tv files" 2019-10-29 22:31:08 +00:00
Jack Yu
000baa69f6 Merge "Addition of 'XorEqualsString' method for comparing String"
am: e750b5b659

Change-Id: Ia9bd50755df21d39ca9b3e2ef955f9a774a994ed
2019-10-29 15:28:36 -07:00
Jian-Yang Liu
648bc74c81 [automerger skipped] Merge "Changed Notification shade's background alpha initial and final values to be configurable." into qt-qpr1-dev am: 90572cb3c6
am: 63150de91d -s ours
am skip reason: change_id Ia0b6a56859889d538e21f807a88bc5217d89e64a with SHA1 cf7b336020 is in history

Change-Id: I993b5534a72d78070797aa1aedac27aa685e6190
2019-10-29 15:28:23 -07:00
Paul Duffin
275d3b5585 Merge "Ignore classes on the classpath when generating stubs"
am: c817b66016

Change-Id: Ia9068a94de9f50cbd387f016da301dd4db0780b1
2019-10-29 15:23:17 -07:00
Jian-Yang Liu
63150de91d Merge "Changed Notification shade's background alpha initial and final values to be configurable." into qt-qpr1-dev
am: 90572cb3c6

Change-Id: I42794c749e67a0fb1a8702dab4e852e9eca27922
2019-10-29 15:21:19 -07:00
Christian Wailes
5ed0e55859 Merge "Fixes a system crash in VibratorService on x86 hosts" 2019-10-29 22:13:06 +00:00
Jian-Yang Liu
90572cb3c6 Merge "Changed Notification shade's background alpha initial and final values to be configurable." into qt-qpr1-dev 2019-10-29 22:02:15 +00:00
Steven Liu
48b101f5a0 Add carrier ID field for WifiConfiguration and PasspointConfiguration
This is only for the load and save Carrier ID field.

Bug: 130875004
Test: build, bootup, unit test

Change-Id: Id48587ca26fc9dc0f7678b5a449e2d39a2e90dae
2019-10-29 14:53:33 -07:00
TreeHugger Robot
4a0b1750ef Merge "NotifMediaManager looks at pending + active notifs" 2019-10-29 21:33:21 +00:00
Tej Singh
480392f55e Data/activation broadcasts use elapsed realtime
The data and activation broadcasts were guardrailed using
elapsedRealtime of the *LogEvent*. However, it's possible to use
incorrect timestamps, and it's also possible that we could process
events that are old, which would result in the broadcast getting sent
too frequently. To fix this, we should use the current elapsedRealtime
instead of the LogEvent's elapsedRealtime.

I can remove the config activation broadcast if we think we should hold
off on it.

Test: bit statsd_test:*
Bug: 143155387
Change-Id: I4c58d2558d6ba3b4fd15a4a619d6f80a7bd7113f
2019-10-29 14:19:38 -07:00
Jack Yu
e750b5b659 Merge "Addition of 'XorEqualsString' method for comparing String" 2019-10-29 21:12:26 +00:00
Treehugger Robot
c817b66016 Merge "Ignore classes on the classpath when generating stubs" 2019-10-29 21:09:29 +00:00
Anthony Hugh
a7f66b7ee8 Merge "Update getUserSwitchability() to handle different user ids and Auto" 2019-10-29 21:08:08 +00:00
Michele
3da8dc145e [automerger skipped] Merge "Expose APIs required by CarrierDefaultApp as system APIs." am: 8c6e9e653d am: d9cb5b9427 am: 03b6954f5b
am: 01f3aa4fff -s ours
am skip reason: change_id I3c678522e70b5d89a6a5a8f6bdb1e3fd91ca8aee with SHA1 61f098ecaf is in history

Change-Id: Ia293151feff2d0fa112867d30a818bf475a991e7
2019-10-29 13:42:23 -07:00
Michele
01f3aa4fff Merge "Expose APIs required by CarrierDefaultApp as system APIs." am: 8c6e9e653d am: d9cb5b9427
am: 03b6954f5b

Change-Id: Iff7b36a5b35766788c1f8cf7e015646804c19fc3
2019-10-29 13:35:53 -07:00
Michele
03b6954f5b Merge "Expose APIs required by CarrierDefaultApp as system APIs." am: 8c6e9e653d
am: d9cb5b9427

Change-Id: Iad08bbff172267a64d5d2b18050f2d23f4f1a60e
2019-10-29 13:28:53 -07:00
Michele
d9cb5b9427 Merge "Expose APIs required by CarrierDefaultApp as system APIs."
am: 8c6e9e653d

Change-Id: I53e5b94caa0c9e7388cb23f6b3f21c134d79d43c
2019-10-29 13:22:50 -07:00
Chris Wailes
7d716426ea Fixes a system crash in VibratorService on x86 hosts
Original symptom: Cuttlefish devices would crash when the "recent apps"
tray was swiped up from the bottom.

Root cause: Raising the "recent apps" tray triggers a vibration.  Close
to the bottom of the call stack responsible for this action in
VibratorService is the native function vibratorPerformEffect().  The
Java Language signature for this function has a long as the type of the
second parameter, as does the JNI signature that is registered with the
environment.  The native function, however, uses an int type for this
parameter.  As a result, when the arguments are passed via the stack on
x86 devices the high bits of the second long argument are read as the
contents of the third argument, which is a jobject reference.  When the
code attempts to convert this NULL local reference into a global
reference the JNI code aborts the runtime for the process.  Because the
VibratorService is part of the SystemServer, when it crashes the Zygote
is notified and restarts the entire shell.

Why this wasn't an issue on ARM devices: ARMs calling conventions pass
many of a function's arguments via registers instead of via the stack.
This means that the long argument is passed in a register, preventing it
from stomping on any other arguments.  When the native function uses the
argument it simply reads the lower bits from the register and ignores
the higher bits.

Why this wasn't previously an issue on X86 hosts: ag/9158254 introduced
a new parameter to the vibratorPerformEffect() function.  This new
parameter is located after the mis-typed parameter and will be aliased
to the high bits of the mis-typed long argument.

Fix: Correct the type signature of the native vibratorPerformEffect()
function.

Bug: 143082450
Test: Build -> start cuttlefish -> raise recent apps tray -> no crash
[adelva: port to AOSP to close potential ASAN issues]
Change-Id: If50f68df9579f84bddc9d70a0a30cd73f4485e96
Merged-In: If50f68df9579f84bddc9d70a0a30cd73f4485e96
2019-10-29 13:09:55 -07:00
JianYang Liu
b923d1e1f0 Changed Notification shade's background alpha initial and final values
to be configurable.

Bug: 143372960
Test: manual - took before and after videos
Merged-In: Ia0b6a56859889d538e21f807a88bc5217d89e64a
Change-Id: Ia0b6a56859889d538e21f807a88bc5217d89e64a
2019-10-29 20:06:41 +00:00
Treehugger Robot
8c6e9e653d Merge "Expose APIs required by CarrierDefaultApp as system APIs." 2019-10-29 20:06:27 +00:00
TreeHugger Robot
8525b42dc5 Merge "Fixes a system crash in VibratorService on x86 hosts" 2019-10-29 20:02:43 +00:00