Commit Graph

83448 Commits

Author SHA1 Message Date
Annie Meng
a9b443de16 Merge "Remove unused critical accessibility settings from backup/restore" 2018-05-08 12:45:57 +00:00
Edward Chen
dac3ddcf7f Merge "Backup and restore default alarm sound setting." 2018-05-08 10:14:29 +00:00
android-build-team Robot
596b65217e Merge "Adding batterystats history to proto dump." 2018-05-08 02:38:23 +00:00
chenedward
c47329bb51 Backup and restore default alarm sound setting.
As currently we don't backup/restore the selected alarm sound
(alarm_alert), but both notification sound and ringtone did,
we add the feature to completed backup/restore sound setting.

Bug: 78330382
Test: atest FrameworksCoreTests:SettingsBackupTest
Change-Id: I83321b5cdab4b7b13c46fa4f32785750e3824fc1
2018-05-08 02:11:01 +00:00
Kweku Adams
3d16091dd2 Adding batterystats history to proto dump.
It will only print out a dump for userdebug or eng builds.

This is the same change as the pi-dev one (http://ag/3909863), but due
to changes in master, that change has a merge conflict, so I have to
create a separate CL for master.

Bug: 77727638
Test: it builds
Change-Id: Ib74d4c664f23a61e6fc33f700ba6a3c6fad32c74
2018-05-07 17:57:42 -07:00
android-build-team Robot
9f7fc4af6f Merge "New FIELD_AUTOFILL_COMPAT_MODE field." into pi-dev am: 88cc74cd6b
am: a96a951269

Change-Id: I95154065ebb1660b06d933df367973fcab3a08ea
2018-05-07 17:51:23 -07:00
Howard Ro
76e3dbf0bd Merge "Re-enable the logging of APP_BREADCRUMB_REPORTED atom" into pi-dev am: 7ca1b03ece
am: e68a729b08

Change-Id: Ie15622ace2952c7ab30047b7935a1d03bfa31a1c
2018-05-07 17:12:11 -07:00
android-build-team Robot
a96a951269 Merge "New FIELD_AUTOFILL_COMPAT_MODE field." into pi-dev
am: 88cc74cd6b

Change-Id: I5127646f7cc27dfc733c6b91ebe73aa367d033dc
2018-05-07 15:14:41 -07:00
Yuichi Araki
d192911511 Merge "Fix race condition with GC in TransitionManager" 2018-05-07 22:12:58 +00:00
android-build-team Robot
88cc74cd6b Merge "New FIELD_AUTOFILL_COMPAT_MODE field." into pi-dev 2018-05-07 21:59:24 +00:00
Howard Ro
e68a729b08 Merge "Re-enable the logging of APP_BREADCRUMB_REPORTED atom" into pi-dev
am: 7ca1b03ece

Change-Id: If52d4b0f2b648e118e9cf10705b4eb2068153b75
2018-05-07 14:56:40 -07:00
Howard Ro
7ca1b03ece Merge "Re-enable the logging of APP_BREADCRUMB_REPORTED atom" into pi-dev 2018-05-07 21:26:47 +00:00
android-build-team Robot
6aae977239 Merge "Bluetooth: Fix HFP SCO logic and documentation" into pi-dev am: 1ae21127da
am: e3e55b865b

Change-Id: Ic45224f318646958574fd624ee228c8938e1a814
2018-05-07 13:03:22 -07:00
android-build-team Robot
e3e55b865b Merge "Bluetooth: Fix HFP SCO logic and documentation" into pi-dev
am: 1ae21127da

Change-Id: I9b4fcac73a283aac1794e13cce464728612fd0dc
2018-05-07 12:56:06 -07:00
Felipe Leme
1116652087 New FIELD_AUTOFILL_COMPAT_MODE field.
This field is used on pretty much all Autofill metrics, except
AUTOFILL_USERDATA_UPDATED, AUTOFILL_SERVICE_DISABLED_SELF, and
AUTOFILL_INVALID_PERMISSION.

Test: atest CtsAutoFillServiceTestCases
Test: adb shell logcat -b events | grep sysui

Bug: 79351659

Change-Id: I2e2f3dcc780a3896162b158926f5ee89c7cb342d
2018-05-07 12:14:00 -07:00
yro
be6d7f90e8 Re-enable the logging of APP_BREADCRUMB_REPORTED atom
Bug: 78613419
Test: manual, cts, unit tests
Change-Id: I279158c8031eda3ee648053ae6a0d13fde7f1176
2018-05-06 22:25:05 -07:00
android-build-team Robot
1cd00f3c8a Merge changes I5ed0feb5,I33faa3c8,Id2ee2e55,Iad0d4e94,I3ae5e544
* changes:
  Revert "Rotate IMEs (subtypes) by Meta+Space."
  Revert "Show toast when subtype is rotated by Meta-Space."
  Revert "Shift+Meta+Space should reverse-rotate subtypes."
  Revert "Shift+Meta+Space should reverse-rotate subtypes part 2."
  Revert "Make sure that Toast is always shown by Meta-Space."
2018-05-07 02:13:23 +00:00
Jack He
89f979849a Bluetooth: Fix HFP SCO logic and documentation
AudioService:
* Call setBtScoActiveDevice and setBluetoothScoOn both in AudioService's
  broadcast receiver so that these two methods must be triggerred in
  the same sequence as ACTIVE_DEVICE_CHANGED and AUDIO_STATE_CHANGED
  intents are sent and we no longer need to handle race condition by
  synchronously checking active device in setBluetoothScoOn
* Default sco audio mode when no headset is active should be virtual
  voice call, as many HFP devices do not accept SCO audio without an
  ongoing call
* Synchronize checkScoAudioState() method with mScoClients
* Add helper functions connectBluetoothScoHelper and
  disconnectBluetoothScoHelper to call various SCO setup and tear down
  methods based on sco audio mode
* Try raw, virtual call, and voice recognition mode when disconnecting
  externally started SCO
* Add new sco state SCO_STATE_DEACTIVATING to allow back to back calling
  of startBluetoothSco and stopBluetoothSco

Audio Manager:
* Modified AudioManager logic so that removed devices callback is called
  before newly added devices

BluetoothHeadset:
* Modified BluetoothHeadset so that start and stop SCO using virtual
  voice call no longer need a parameter and will use active device by
  default
* Modified documentation around various sco mangement APIs to match
  their expected behaviors

Bug: 76114959
Test: VoIP calls sanity test cases
Change-Id: Id50db88f4ff36069b0f392c81dd9d90c24cd2206
2018-05-04 19:49:49 -07:00
android-build-team Robot
b88217bd17 Merge "Fix spelling errors in BluetoothGatt documentation" into pi-dev 2018-05-05 01:29:53 +00:00
android-build-team Robot
4abb099e14 Merge "Convert RTT background throttle to a settable value (1/2)." into pi-dev am: 564942d065
am: 2629cb09ea

Change-Id: Ic8858402a12e08ca1774d06a8b0d435ca40826e5
2018-05-04 16:59:54 -07:00
android-build-team Robot
2629cb09ea Merge "Convert RTT background throttle to a settable value (1/2)." into pi-dev
am: 564942d065

Change-Id: I4fa6433b1e0fa320568c0b8c5ed5f2ce5c93314b
2018-05-04 16:53:04 -07:00
android-build-team Robot
564942d065 Merge "Convert RTT background throttle to a settable value (1/2)." into pi-dev 2018-05-04 23:40:22 +00:00
Stanley Tng
c87223b718 Fix spelling errors in BluetoothGatt documentation
Correct "paramter" to "parameter". Correct "connectoin" to connection.

Bug: 79198797
Test: Compile
Change-Id: I98646eec66da2aaa6f74ae2db35ea914c6a105a1
(cherry picked from commit 505c05839b)
2018-05-04 23:20:46 +00:00
android-build-team Robot
66fca3e43f Merge "Propagate calling UID to AM from CrossProfileApps" into pi-dev am: 7bfb942e2d
am: 3f1c2382c9

Change-Id: If002ec36dfa98c5699b5f6270eb60e22b1dffa87
2018-05-04 12:58:27 -07:00
Yohei Yukawa
fec8cef7ed Revert "Rotate IMEs (subtypes) by Meta+Space."
This reverts commit ae61f7118a [1].

Reason for revert: to deprecate Meta-Space short cut.

 [1]: I4005692215edfcf8bed3e86b1e07000148f986f5

Bug: 79150878
Test: Manually tested as follows.
  1. make -j SoftKeyboard
  2. adb install -r $OUT/system/app/SoftKeyboard/SoftKeyboard.apk
  3. adb shell ime enable com.example.android.softkeyboard/.SoftKeyboard
  4. Connect a hardware keyboard
  5. adb shell settings get secure default_input_method
  6. Hit Meta+Space on the hardware keyboard.
  7. adb shell settings get secure default_input_method
  8. Make sure that the results of step 5 and step 7 are the same.
Change-Id: I5ed0feb5a6d7171564d358644b04ee2a43e4d6b3
2018-05-04 12:53:40 -07:00
android-build-team Robot
3f1c2382c9 Merge "Propagate calling UID to AM from CrossProfileApps" into pi-dev
am: 7bfb942e2d

Change-Id: Id064e40dd38100f25936d0c977f6018c560c0076
2018-05-04 12:51:44 -07:00
android-build-team Robot
7bfb942e2d Merge "Propagate calling UID to AM from CrossProfileApps" into pi-dev 2018-05-04 19:35:44 +00:00
Andrii Kulian
591eb66db7 Merge "Schedule local activity relaunch" into pi-dev am: 1ed9f4294c
am: aad8cbf14e

Change-Id: I135975e50bde928f5d18cd0993f22b1d857fbb44
2018-05-04 11:51:32 -07:00
Andrii Kulian
aad8cbf14e Merge "Schedule local activity relaunch" into pi-dev
am: 1ed9f4294c

Change-Id: I7ff272e057bed855ce187aa759f197807a50d683
2018-05-04 11:41:59 -07:00
Andrii Kulian
1ed9f4294c Merge "Schedule local activity relaunch" into pi-dev 2018-05-04 18:23:32 +00:00
android-build-team Robot
7c39b7af3c Merge "Just drop the default WP bitmap, don't explicitly recycle it" into pi-dev am: 018166c16e
am: 9f275bd435

Change-Id: I77b78cb14e3cb7df901f8dd077c5c91faa21cf16
2018-05-04 11:16:44 -07:00
android-build-team Robot
9f275bd435 Merge "Just drop the default WP bitmap, don't explicitly recycle it" into pi-dev
am: 018166c16e

Change-Id: If56a713c4c8032fbf4cd0707715d6952ba641ee4
2018-05-04 11:04:11 -07:00
android-build-team Robot
018166c16e Merge "Just drop the default WP bitmap, don't explicitly recycle it" into pi-dev 2018-05-04 17:47:04 +00:00
Rose Liu
6de5ddc64f Merge "Add @SystemApi to related VR functions that will be used by VrCore Services." 2018-05-04 17:20:52 +00:00
android-build-team Robot
e145f4d7ff Merge "Update dnd defaults for new users" into pi-dev am: 8aec7be10e
am: e799bda2e0

Change-Id: Ia9dff7647091ebdd62738030b888d0d805b043b3
2018-05-04 07:15:02 -07:00
android-build-team Robot
e799bda2e0 Merge "Update dnd defaults for new users" into pi-dev
am: 8aec7be10e

Change-Id: I2f6bdb45f12e90ea3a1d6ce01f2bebcd82a8b31e
2018-05-04 07:05:10 -07:00
android-build-team Robot
8aec7be10e Merge "Update dnd defaults for new users" into pi-dev 2018-05-04 13:54:27 +00:00
android-build-team Robot
b096a34428 Merge "Reset statsd and correctly record the dump reason when system server restarts/crashes." into pi-dev am: ec41a069fd
am: c1d985cf8b

Change-Id: I4df0cd841757ed13a9f7bf0f5bbf4d2df8ff0fb2
2018-05-03 20:15:56 -07:00
android-build-team Robot
c1d985cf8b Merge "Reset statsd and correctly record the dump reason when system server restarts/crashes." into pi-dev
am: ec41a069fd

Change-Id: If18ec5d227a70e070a1a66d9a229de04d986d27f
2018-05-03 20:03:53 -07:00
android-build-team Robot
ec41a069fd Merge "Reset statsd and correctly record the dump reason when system server restarts/crashes." into pi-dev 2018-05-04 02:43:03 +00:00
Andrii Kulian
320e3b546f Schedule local activity relaunch
If local activity relaunch is executed immediately, and if
recreate() was called from a lifecycle callback, then existing
instance of activity will be destroyed while ActivityThread may
continue using it to finish performing a transaction item.
To remove this double lifecycle loop we now schedule local activity
relaunch on client thread instead of executing it immediately.
It worked in similar way until changes in b/30060825.

Bug: 78576150
Bug: 64610483
Bug: 30060825
Test: ActivityLifecycleTests
Change-Id: Ic0cef229f2f9df0fa40066d8540c4b29da7bdc58
2018-05-03 17:34:16 -07:00
android-build-team Robot
8966f68c30 Merge "Add app op for Bluetooth scans" into pi-dev
am: 6fb01a8a56

Change-Id: I42db780781f14b1ba7fcf8116e8d6509eb6ec664
2018-05-03 17:24:24 -07:00
Yangster-mac
892f3d3229 Reset statsd and correctly record the dump reason when system
server restarts/crashes.

Test: statsd test
BUG: b/79161505
Change-Id: I0646c764964f6eafde91f9ae0179a1c837af320d
2018-05-03 17:05:24 -07:00
android-build-team Robot
6fb01a8a56 Merge "Add app op for Bluetooth scans" into pi-dev 2018-05-04 00:01:53 +00:00
Dianne Hackborn
e29b9f8f0c Merge "Add app op for Bluetooth scans" 2018-05-04 00:00:07 +00:00
Rob Carr
b41cd31024 Merge "SurfaceControl: Close CloseGuard when destroying surface in transaction." into pi-dev am: 625de7758b
am: 15d55c26cf

Change-Id: I015977e3c79f0fe19fc60d028770fa00a9a669b8
2018-05-03 16:59:22 -07:00
Rob Carr
15d55c26cf Merge "SurfaceControl: Close CloseGuard when destroying surface in transaction." into pi-dev
am: 625de7758b

Change-Id: I254ad6e09b1e5a0677d4dfc52a6abe875c89e79d
2018-05-03 16:06:16 -07:00
Rob Carr
625de7758b Merge "SurfaceControl: Close CloseGuard when destroying surface in transaction." into pi-dev 2018-05-03 22:52:18 +00:00
android-build-prod (mdb)
f63735289f Merge "Fix spelling errors in BluetoothGatt documentation" am: e7b05b8797 am: ea18806cb7
am: fe1ad15da1

Change-Id: Id9e0664f5b38b837c7ab484c4dc2aa3b9141bd39
2018-05-03 15:38:59 -07:00
android-build-prod (mdb)
fe1ad15da1 Merge "Fix spelling errors in BluetoothGatt documentation" am: e7b05b8797
am: ea18806cb7

Change-Id: I5fcb0f3506a4e8856c2971302c98f4ba5b9ffffc
2018-05-03 15:16:49 -07:00