PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,469 Commits 1 Branch 0 Tags
1bcc2ff789480eedfe48834d8860d79d3098eb7c
Commit Graph

54469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raff Tsai
c30e3ae727 Merge "Fix IllegalArgumentException in AudioHelper" into qt-dev am: fde0bee473 am: ce6c934609 
am: f19cab831a

Change-Id: I3b19911c37631acaec09a347c64512d68989429b
 2019-05-30 03:05:15 -07:00
Raff Tsai
8c4c8dd1c5 Merge "Fix IllegalArgumentException in AudioHelper" into qt-dev am: fde0bee473 
am: 7d0518bdfa

Change-Id: I4b9dff799239656bfee6e383f9a89ab1be94e108
 2019-05-30 03:03:45 -07:00
Raff Tsai
f19cab831a Merge "Fix IllegalArgumentException in AudioHelper" into qt-dev am: fde0bee473 
am: ce6c934609

Change-Id: I30e96444b838eb3026245fafd09fcc9e45bac964
 2019-05-30 03:01:05 -07:00
Raff Tsai
7d0518bdfa Merge "Fix IllegalArgumentException in AudioHelper" into qt-dev 
am: fde0bee473

Change-Id: I979bf482e49c1961b68c9d1f29f2fd4a7d53368c
 2019-05-30 02:57:00 -07:00
Raff Tsai
ce6c934609 Merge "Fix IllegalArgumentException in AudioHelper" into qt-dev 
am: fde0bee473

Change-Id: Iafe2e30e1fb3bb80c17f2ef651b41d5e8b458a38
 2019-05-30 02:56:45 -07:00
TreeHugger Robot
fde0bee473 Merge "Fix IllegalArgumentException in AudioHelper" into qt-dev 2019-05-30 09:39:33 +00:00
Raff Tsai
1a2b34b625 Fix IllegalArgumentException in AudioHelper 
Audio streams for phone calls in BT device (STREAM_VOICE_CALL) is not
supported in AudioManager.getStreamMinVolume(), fallback to use
STREAM_VOICE_CALL

Fixes: 133812547
Test: make RunSettingsRoboTests
Change-Id: I8e330f60bae2a7cf9cd0cf7288076b8320ccc504
 2019-05-30 16:18:37 +08:00
Sunny Shao
44540b3199 Merge "Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev am: 3d16fc9519 am: 0135cde020" into qt-r1-dev-plus-aosp 
am: 6b8a4a96b2

Change-Id: Ib059840e7b2bd76117027b0a37e2bd54afea1c72
 2019-05-30 00:15:32 -07:00
Sunny Shao
33a45255d9 Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev am: 3d16fc9519 am: 9c4fb7ea1d 
am: 27f5a01cef

Change-Id: I4296880c339aecf93ddaa57cafeb04815b6e40e3
 2019-05-30 00:08:59 -07:00
Lucas Dupin
d5d76a95ec Merge "Add setting to bypass lock screen" into qt-r1-dev am: 0783505433 
am: a44a66f52a

Change-Id: I8164b1e3e6f32896710268d481b7fec593602fd3
 2019-05-30 00:06:11 -07:00
Android Build Merger (Role)
6b8a4a96b2 Merge "Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev am: 3d16fc9519 am: 0135cde020" into qt-r1-dev-plus-aosp 2019-05-30 07:05:35 +00:00
Sunny Shao
85816a0676 Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev am: 3d16fc9519 
am: 0135cde020

Change-Id: Ied8931ba2b46492c37f08d6c39109cc1aff868fb
 2019-05-30 00:05:26 -07:00
Sunny Shao
27f5a01cef Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev am: 3d16fc9519 
am: 9c4fb7ea1d

Change-Id: I2e74ff23833524c00f7fa5730199ce15bd662959
 2019-05-30 00:05:20 -07:00
Sunny Shao
0135cde020 Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev 
am: 3d16fc9519

Change-Id: Id2aa3c501378686d1b3a1b352b8fa15132bc396f
 2019-05-30 00:00:24 -07:00
Sunny Shao
9c4fb7ea1d Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev 
am: 3d16fc9519

Change-Id: I9bd04562a2d86e80c5401434eef5c45baaa6be87
 2019-05-30 00:00:22 -07:00
Lucas Dupin
a44a66f52a Merge "Add setting to bypass lock screen" into qt-r1-dev 
am: 0783505433

Change-Id: I533383a4e7c9ecc068c24cd55647c55487dfd5a6
 2019-05-30 00:00:13 -07:00
Lucas Dupin
0783505433 Merge "Add setting to bypass lock screen" into qt-r1-dev 2019-05-30 06:50:17 +00:00
TreeHugger Robot
3d16fc9519 Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev 2019-05-30 06:37:12 +00:00
Sunny Shao
d843ee85de Fixed the IllegalStateException on removing account 
According the log, I found that there are a lot of DeadObjectException and gms servervice restart.
The system became unstable during this period, so add try/catch to avoid the exception of the Settings.

Fixes: 133253227
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.accounts
      make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.core
      make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.dashboard

Change-Id: I8534e8f7118234f6346607415698f9f91c3e5ffb
 2019-05-30 11:24:49 +08:00
Mehdi Alizadeh
be98ea25ca Increase char limit to 60 for string translation 
Bug: 133862422
Test: None
Change-Id: I3fa6705a6657c5aa65e496cba2ce470fb558a45f
 2019-05-29 20:22:09 -07:00
Raff Tsai
f87cc26514 Merge "[automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd am: fd058ab872 -s ours am: 3fb5933880 -s ours am: 08672ec74e -s ours am: dd7de36bbc -s ours am: 079ed79164 -s ours 
am: 917200e90f -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I55adb5089e12883192978c81c53e2c4b104ebe54
 2019-05-29 19:01:53 -07:00
Raff Tsai
d9815a1bec [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd am: fd058ab872 -s ours am: 3fb5933880 -s ours am: 08672ec74e -s ours am: dd7de36bbc -s ours am: c3740704f3 -s ours 
am: 487e7af0f8 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Ife8a9baf723b6cfdcb8a962aaaa405114006d73f
 2019-05-29 19:00:19 -07:00
Raff Tsai
0f3ce78b1f Merge "[automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev am: b95361ab60 -s ours am: 8837b15f78 -s ours am: 93aed56281 -s ours am: 6d531e67ac -s ours 
am: 9d5dbaf4b6 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I069d68bb493540a410fcecc93204fdff66e7c521
 2019-05-29 18:55:37 -07:00
Android Build Merger (Role)
917200e90f Merge "[automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd am: fd058ab872 -s ours am: 3fb5933880 -s ours am: 08672ec74e -s ours am: dd7de36bbc -s ours am: 079ed79164 -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history" into qt-r1-dev-plus-aosp 2019-05-30 01:55:35 +00:00
Raff Tsai
3bc902adbc [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd am: fd058ab872 -s ours am: 3fb5933880 -s ours am: 08672ec74e -s ours am: dd7de36bbc -s ours 
am: 079ed79164 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Idbf2372cefe12b76aeb9569fd09f54f6d6655afd
 2019-05-29 18:55:21 -07:00
Raff Tsai
487e7af0f8 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd am: fd058ab872 -s ours am: 3fb5933880 -s ours am: 08672ec74e -s ours am: dd7de36bbc -s ours 
am: c3740704f3 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I8d254e69b173955f2b4c2aeee5d59268bac817e3
 2019-05-29 18:55:14 -07:00
Raff Tsai
d6a20918db [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev am: b95361ab60 -s ours am: 8837b15f78 -s ours am: 93aed56281 -s ours am: 3e6af30847 -s ours 
am: 63d79583da -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I0d3154c39f5b7b3b91bb46c0c5da148cf1323d2b
 2019-05-29 18:54:50 -07:00
Raff Tsai
c3740704f3 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd am: fd058ab872 -s ours am: 3fb5933880 -s ours am: 08672ec74e -s ours 
am: dd7de36bbc -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: If8f23bb912f13f355b807358e28f5d74c0bfa066
 2019-05-29 18:50:30 -07:00
Raff Tsai
079ed79164 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd am: fd058ab872 -s ours am: 3fb5933880 -s ours am: 08672ec74e -s ours 
am: dd7de36bbc -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Ifac0cbe2dfe1b76012bf0d7a182f4eeca69a0e06
 2019-05-29 18:49:31 -07:00
Android Build Merger (Role)
9d5dbaf4b6 Merge "[automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev am: b95361ab60 -s ours am: 8837b15f78 -s ours am: 93aed56281 -s ours am: 6d531e67ac -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history" into qt-r1-dev-plus-aosp 2019-05-30 01:48:59 +00:00
Raff Tsai
0da67bbf43 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev am: b95361ab60 -s ours am: 8837b15f78 -s ours am: 93aed56281 -s ours 
am: 6d531e67ac -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I255e17faf09a97497de36c8928b7881da12c6f0a
 2019-05-29 18:48:49 -07:00
Raff Tsai
63d79583da [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev am: b95361ab60 -s ours am: 8837b15f78 -s ours am: 93aed56281 -s ours 
am: 3e6af30847 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Ib69f2398c7489eb48583a37c38f8341680ab3096
 2019-05-29 18:48:45 -07:00
Raff Tsai
dd7de36bbc [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd am: fd058ab872 -s ours am: 3fb5933880 -s ours 
am: 08672ec74e -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I1f06a8e5c931e789518ea1a751a93ecfc73a9090
 2019-05-29 18:44:27 -07:00
Raff Tsai
6d531e67ac [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev am: b95361ab60 -s ours am: 8837b15f78 -s ours 
am: 93aed56281 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I4f9a572f60d6233d55a3ef973c34c85b33700fdd
 2019-05-29 18:40:47 -07:00
Raff Tsai
08672ec74e [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd am: fd058ab872 -s ours 
am: 3fb5933880 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 9fa8329b02 is in history

Change-Id: I68b1c3e845c9f8cff305583b6cd19869e36cc027
 2019-05-29 18:40:29 -07:00
Raff Tsai
3e6af30847 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev am: b95361ab60 -s ours am: 8837b15f78 -s ours 
am: 93aed56281 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Ic8675a751a6efde129338108c318d4f75ab75518
 2019-05-29 18:38:38 -07:00
Raff Tsai
3fb5933880 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd 
am: fd058ab872 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 e4800786cf is in history

Change-Id: I7fbd29f4d72fda672e986f12d17e37bee1b89e4b
 2019-05-29 18:35:24 -07:00
Raff Tsai
93aed56281 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev am: b95361ab60 -s ours 
am: 8837b15f78 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Iaee4509328c45e5405edc1bae475d2e1cf5f4ba7
 2019-05-29 18:33:23 -07:00
Raff Tsai
fd058ab872 Merge "Do not allow draw on top for App notification settings" into oc-dev 
am: 811229a2fd

Change-Id: Ie5ed40b8f573b974850234987bacc5ae7db925a4
 2019-05-29 18:30:24 -07:00
Raff Tsai
8837b15f78 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev 
am: b95361ab60 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 9fa8329b02 is in history

Change-Id: I66e6f4f24bd7349db363f28f0462d16825e544c8
 2019-05-29 18:28:27 -07:00
TreeHugger Robot
811229a2fd Merge "Do not allow draw on top for App notification settings" into oc-dev 2019-05-30 01:14:19 +00:00
TreeHugger Robot
b95361ab60 Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev 2019-05-30 01:11:01 +00:00
Raff Tsai
cb2c9e02de [automerger skipped] Merge "Do not allow draw on top for App notification settings" into pi-dev am: 4d01717c14 -s ours am: d08b633e28 -s ours am: 9da6ed05d9 -s ours 
am: 30a308599b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I4701e4f94bab2fa1303c5f49269c6c209b5239d3
 2019-05-29 17:52:15 -07:00
Raff Tsai
7f11007345 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into pi-dev am: 4d01717c14 -s ours am: d08b633e28 -s ours am: a9d597f911 -s ours 
am: 34862d102e -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I99cd44ce49282f2ed63c2f258ad578ab4661020a
 2019-05-29 17:50:10 -07:00
Raff Tsai
30a308599b [automerger skipped] Merge "Do not allow draw on top for App notification settings" into pi-dev am: 4d01717c14 -s ours am: d08b633e28 -s ours 
am: 9da6ed05d9 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I8cfafba599e2b035183a51c717e415e749230bf8
 2019-05-29 17:43:55 -07:00
Raff Tsai
34862d102e [automerger skipped] Merge "Do not allow draw on top for App notification settings" into pi-dev am: 4d01717c14 -s ours am: d08b633e28 -s ours 
am: a9d597f911 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: I38ef7a4ec9670637a3bd16f484cc88862547d39b
 2019-05-29 17:39:47 -07:00
Raff Tsai
9da6ed05d9 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into pi-dev am: 4d01717c14 -s ours 
am: d08b633e28 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Id6c85e054c145ef831461a69ed19a85c01b96a7b
 2019-05-29 17:36:52 -07:00
Raff Tsai
a9d597f911 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into pi-dev am: 4d01717c14 -s ours 
am: d08b633e28 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Ic89de10d4c3e242a5b5cc442804d26ffbbe8ed72
 2019-05-29 17:31:57 -07:00
Raff Tsai
d08b633e28 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into pi-dev 
am: 4d01717c14 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Ifb49814e6f18d000aafb89652ce26e5469ef0fb5
 2019-05-29 17:28:49 -07:00
TreeHugger Robot
4d01717c14 Merge "Do not allow draw on top for App notification settings" into pi-dev 2019-05-30 00:15:17 +00:00