Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
430,340 Commits 3 Branches 0 Tags
41c35364f5efaff7c69b73bb1d9b9ea33db37a3a
Commit Graph

430340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Laird
41c35364f5 Merge "Bump up contrast of NotificationInfo.Secondary" into qt-dev am: 19d096e712 am: 47df423280 
am: 678b8c7c38

Change-Id: I51944216bd3cf2f9c92bc4b485c30f5f527b3743
 2019-06-13 15:53:03 -07:00
Evan Laird
678b8c7c38 Merge "Bump up contrast of NotificationInfo.Secondary" into qt-dev am: 19d096e712 
am: 47df423280

Change-Id: I46e9aa1fbb280120c39440d9e554119cb520340d
 2019-06-13 15:39:19 -07:00
Evan Laird
47df423280 Merge "Bump up contrast of NotificationInfo.Secondary" into qt-dev 
am: 19d096e712

Change-Id: I6f69bf6b1079884924336f0fb0e1ac6026a11b75
 2019-06-13 15:22:14 -07:00
TreeHugger Robot
19d096e712 Merge "Bump up contrast of NotificationInfo.Secondary" into qt-dev 2019-06-13 21:51:25 +00:00
Brad Ebinger
04a2de59ca [automerger skipped] Merge changes from topic "cp_sms_trampoline_intent" am: 781ac9ef8e am: 2ed57a6d63 -s ours am: 7775134e13 -s ours 
am: 867a6009e7 -s ours
am skip reason: change_id Ibbc07c961f1bdc19e1015885487e9f7b6a14fa83 with SHA1 42ce8673bb is in history

Change-Id: I159b75cbdae1a7215f32ffd348ca85abbd6e6523
 2019-06-13 14:24:10 -07:00
Brad Ebinger
ef6fd836ee [automerger skipped] No longer show disambig when calling SmsManager#getSubId am: 26b242f75e am: 09a6b60098 -s ours am: 9bccfb7801 -s ours 
am: 304b962dde -s ours
am skip reason: change_id Ibbc07c961f1bdc19e1015885487e9f7b6a14fa83 with SHA1 42ce8673bb is in history

Change-Id: Ia1e9e110073c65c8e7141f9a8f89ba97816945a2
 2019-06-13 14:23:54 -07:00
Brad Ebinger
867a6009e7 [automerger skipped] Merge changes from topic "cp_sms_trampoline_intent" am: 781ac9ef8e am: 2ed57a6d63 -s ours 
am: 7775134e13 -s ours
am skip reason: change_id Ibbc07c961f1bdc19e1015885487e9f7b6a14fa83 with SHA1 42ce8673bb is in history

Change-Id: I4f8f8cd4420e0dce1a8c44d4d8156e59f18d1944
 2019-06-13 14:02:19 -07:00
Brad Ebinger
304b962dde [automerger skipped] No longer show disambig when calling SmsManager#getSubId am: 26b242f75e am: 09a6b60098 -s ours 
am: 9bccfb7801 -s ours
am skip reason: change_id Ibbc07c961f1bdc19e1015885487e9f7b6a14fa83 with SHA1 42ce8673bb is in history

Change-Id: Iddc6e76480c521073c4a70653c420a5bcdd62766
 2019-06-13 14:02:00 -07:00
Lucas Dupin
8a3c717fee Merge "Do not execute face auth when notification" into qt-r1-dev am: 027ffd9dd7 
am: 1023e279e7

Change-Id: I0ec4006d3ec1b38c6bfa23fef8a7702f84f102d8
 2019-06-13 13:56:59 -07:00
Stanislav Zholnin
159b48dc99 Merge "Merge "Add atom for logging of ReviewPermissionsFragment actions." into qt-dev am: 15ae30124d am: 32bf74150c" into qt-r1-dev-plus-aosp 
am: 355ef2e59d

Change-Id: I5e3101235bbb6180d41332e95d5fae1d04f2e2bc
 2019-06-13 13:55:07 -07:00
Stanislav Zholnin
cfbda4778b Merge "Add atom for logging of ReviewPermissionsFragment actions." into qt-dev am: 15ae30124d am: 40a280a167 
am: 079da4cecf

Change-Id: I4cabda75e06b3524ddb87c920ecef53f14a08b83
 2019-06-13 13:53:10 -07:00
Brad Ebinger
7775134e13 [automerger skipped] Merge changes from topic "cp_sms_trampoline_intent" am: 781ac9ef8e 
am: 2ed57a6d63 -s ours
am skip reason: change_id Ibbc07c961f1bdc19e1015885487e9f7b6a14fa83 with SHA1 42ce8673bb is in history

Change-Id: Iaffeade59b2cb8e13b2e7f54a6a6e06eb967369c
 2019-06-13 13:52:04 -07:00
Brad Ebinger
9bccfb7801 [automerger skipped] No longer show disambig when calling SmsManager#getSubId am: 26b242f75e 
am: 09a6b60098 -s ours
am skip reason: change_id Ibbc07c961f1bdc19e1015885487e9f7b6a14fa83 with SHA1 42ce8673bb is in history

Change-Id: I37c1505f2974d09c4caa43d48f9d0ddaacca1918
 2019-06-13 13:51:48 -07:00
Lucas Dupin
1023e279e7 Merge "Do not execute face auth when notification" into qt-r1-dev 
am: 027ffd9dd7

Change-Id: Ie782ef61e9663ff61620d43addbd600a58ef1a8f
 2019-06-13 13:45:21 -07:00
Android Build Merger (Role)
355ef2e59d Merge "Merge "Add atom for logging of ReviewPermissionsFragment actions." into qt-dev am: 15ae30124d am: 32bf74150c" into qt-r1-dev-plus-aosp 2019-06-13 20:44:05 +00:00
Brad Ebinger
2ed57a6d63 Merge changes from topic "cp_sms_trampoline_intent" 
am: 781ac9ef8e

Change-Id: I116fbe433d004f67703b5b2f7e3e47b2d87a9c4e
 2019-06-13 13:43:25 -07:00
Stanislav Zholnin
0a9a6e109d Merge "Add atom for logging of ReviewPermissionsFragment actions." into qt-dev am: 15ae30124d 
am: 32bf74150c

Change-Id: If7576849fb8846265dab96cf63da9c9b150f2da5
 2019-06-13 13:43:25 -07:00
Brad Ebinger
09a6b60098 No longer show disambig when calling SmsManager#getSubId 
am: 26b242f75e

Change-Id: I6d0487c356d64868393f5d20375ca91efbe31c53
 2019-06-13 13:43:09 -07:00
Stanislav Zholnin
079da4cecf Merge "Add atom for logging of ReviewPermissionsFragment actions." into qt-dev am: 15ae30124d 
am: 40a280a167

Change-Id: Id067b8cb3754c5597fb2663e4797614a1533faaa
 2019-06-13 13:42:59 -07:00
TreeHugger Robot
027ffd9dd7 Merge "Do not execute face auth when notification" into qt-r1-dev 2019-06-13 20:32:35 +00:00
Stanislav Zholnin
40a280a167 Merge "Add atom for logging of ReviewPermissionsFragment actions." into qt-dev 
am: 15ae30124d

Change-Id: I6bce6a869671a99e534271d8291ca5111741df21
 2019-06-13 13:29:47 -07:00
Stanislav Zholnin
32bf74150c Merge "Add atom for logging of ReviewPermissionsFragment actions." into qt-dev 
am: 15ae30124d

Change-Id: Ideec2a7b87b5089e3b343212cb8656c3326a0e11
 2019-06-13 13:27:34 -07:00
Brad Ebinger
781ac9ef8e Merge changes from topic "cp_sms_trampoline_intent" 
* changes:
  Trampoline SMS disambig dialog to Telephony
  No longer show disambig when calling SmsManager#getSubId
 2019-06-13 20:17:19 +00:00
TreeHugger Robot
15ae30124d Merge "Add atom for logging of ReviewPermissionsFragment actions." into qt-dev 2019-06-13 20:15:35 +00:00
TreeHugger Robot
09ed889005 Merge "equals!" 2019-06-13 19:42:21 +00:00
Ady Abraham
e697109c55 Merge "DisplayModeDirector: make settings higher priority than app request" into qt-r1-dev am: 86f8d22d6a 
am: d482cda9d7

Change-Id: I6285c9a7e08f226539d5e640f8bf5e4d94393770
 2019-06-13 11:41:46 -07:00
Ady Abraham
d482cda9d7 Merge "DisplayModeDirector: make settings higher priority than app request" into qt-r1-dev 
am: 86f8d22d6a

Change-Id: Ibde8751a52dc6b5273ea4d6fda8be2bd2a7dc8e0
 2019-06-13 11:33:47 -07:00
Brad Ebinger
05f4ff0a95 Trampoline SMS disambig dialog to Telephony 
SmsManager used to display a "select default SMS
subscription" dialog every time SmsManager was used
and no default SMS subscription was set. This change
fixes the following issues:
1_ getSubscriptionId no longer pops up a disambig
dialog.
2) The disambig dialog no longer sets the
default, rather it waits for the response from the
user and performs the operation when it receives
a response.
2a) Dialogs can no longer be created from background
services, so we now have a restriction that if
the disambig dialog is shown via a background service,
we will use phone 0 as default (backwards compat for
apps targeting <Q) or fail (on apps targeting Q+).
3) If there is only one active subscription, use that
to perform the operation on MSIM devices instead of
asking and only displaying the one active subscription.
4) Certain non "user-facing" APIs that are used by
carrier apps no longer will pop up a UI.

Bug: 131713446
Bug: 130853716
Bug: 129141025

Test: run SmsManagerTestApp; atest TelephonyFrameworksTests

Merged-In: Ibbc07c961f1bdc19e1015885487e9f7b6a14fa83
Change-Id: I6be1c6d7bf6b6ee614b6a7d0369147e3b1890588
 2019-06-13 18:30:14 +00:00
Brad Ebinger
26b242f75e No longer show disambig when calling SmsManager#getSubId 
SmsManager#getSubId used to show a disambig dialog to
pick a default SMS subscription when
SmsManager#getSubscriptionId was called. Since it was used
internally as well, it would cause many of these dialogs
to pop up over and over again.

Do not display the dialog anymore and instead move the
dialog pop up to the methods that actually require the use
of the dialog, such as sending a text.

Bug: 130853716
Test: Manual, Default SMS app
Merged-In: Ibbc07c961f1bdc19e1015885487e9f7b6a14fa83
Change-Id: I71ad38f76750c750b149e4cdcb6fcf99ed89212e
 2019-06-13 18:29:59 +00:00
TreeHugger Robot
86f8d22d6a Merge "DisplayModeDirector: make settings higher priority than app request" into qt-r1-dev 2019-06-13 18:08:25 +00:00
Torne (Richard Coles)
8265d3f727 Merge "Merge "Always re-enable the fallback WebView if needed." into qt-dev am: 4c510c08da am: 39cc8ee150" into qt-r1-dev-plus-aosp 
am: db5eece118

Change-Id: Ie2aa3fcab49b6813f6b4bd6bbb13f6fef8d99279
 2019-06-13 11:06:27 -07:00
Torne (Richard Coles)
241a0dc3c5 Merge "Always re-enable the fallback WebView if needed." into qt-dev am: 4c510c08da am: 2f68a90664 
am: 55fc0f580e

Change-Id: Iee31463c6562bbba8d65a5139808bbdebdb50f3a
 2019-06-13 11:03:20 -07:00
Android Build Merger (Role)
db5eece118 Merge "Merge "Always re-enable the fallback WebView if needed." into qt-dev am: 4c510c08da am: 39cc8ee150" into qt-r1-dev-plus-aosp 2019-06-13 17:54:35 +00:00
Torne (Richard Coles)
1f107f15ae Merge "Always re-enable the fallback WebView if needed." into qt-dev am: 4c510c08da 
am: 39cc8ee150

Change-Id: I61571c0ae961d35366e0c30197eb1138609b10d1
 2019-06-13 10:53:44 -07:00
Torne (Richard Coles)
55fc0f580e Merge "Always re-enable the fallback WebView if needed." into qt-dev am: 4c510c08da 
am: 2f68a90664

Change-Id: Ia24f4688cb3cf37aab9d70577c30a8f2bdaaa704
 2019-06-13 10:53:40 -07:00
Torne (Richard Coles)
2f68a90664 Merge "Always re-enable the fallback WebView if needed." into qt-dev 
am: 4c510c08da

Change-Id: Ie7a4ea638bf199cab3d89afcf69aba9d2c5b7f75
 2019-06-13 10:47:14 -07:00
Torne (Richard Coles)
39cc8ee150 Merge "Always re-enable the fallback WebView if needed." into qt-dev 
am: 4c510c08da

Change-Id: Ie935a947113b360d97a2d5af938b92d53190308c
 2019-06-13 10:47:13 -07:00
TreeHugger Robot
4c510c08da Merge "Always re-enable the fallback WebView if needed." into qt-dev 2019-06-13 17:25:32 +00:00
Siarhei Vishniakou
c27868e210 Merge "Merge "Add keylayout for Xbox One USB controller" into qt-dev am: 77c1c938a5 am: d88c406724" into qt-r1-dev-plus-aosp 
am: 899b78de34

Change-Id: Iec950df3b5c4a19d5ad81222c325337aee04d523
 2019-06-13 10:25:04 -07:00
Siarhei Vishniakou
6b77f74756 Merge "Add keylayout for Xbox One USB controller" into qt-dev am: 77c1c938a5 am: a0c0e2f8c9 
am: b18b8c081a

Change-Id: I19c3e94230748d1fa61b5de74cc070a5b90964f8
 2019-06-13 10:23:06 -07:00
TreeHugger Robot
5ca06946f4 Merge "Make SurfaceControl Transaction parcelable 1/2" 2019-06-13 17:19:45 +00:00
Android Build Merger (Role)
899b78de34 Merge "Merge "Add keylayout for Xbox One USB controller" into qt-dev am: 77c1c938a5 am: d88c406724" into qt-r1-dev-plus-aosp 2019-06-13 17:16:58 +00:00
Siarhei Vishniakou
b18b8c081a Merge "Add keylayout for Xbox One USB controller" into qt-dev am: 77c1c938a5 
am: a0c0e2f8c9

Change-Id: I2f976c7f2cbc160ff2c1818474d4ee41b00c95e8
 2019-06-13 10:16:03 -07:00
Siarhei Vishniakou
775bf1b961 Merge "Add keylayout for Xbox One USB controller" into qt-dev am: 77c1c938a5 
am: d88c406724

Change-Id: I97a928133750e297928cf13508c050dcab22924c
 2019-06-13 10:16:02 -07:00
Siarhei Vishniakou
d88c406724 Merge "Add keylayout for Xbox One USB controller" into qt-dev 
am: 77c1c938a5

Change-Id: Ife6c4a83dc0bf8e183360306208737b42b3cd08b
 2019-06-13 10:10:11 -07:00
Lucas Dupin
a422c09e02 Do not execute face auth when notification 
There's a big power cost and very high likelihood of failing

Test: manual
Test: atest StatusBarTest
Fixes: 134551789
Change-Id: I6593797316e6e24180ad79a37aed2de8aa12fd96
 2019-06-13 10:08:19 -07:00
Siarhei Vishniakou
a0c0e2f8c9 Merge "Add keylayout for Xbox One USB controller" into qt-dev 
am: 77c1c938a5

Change-Id: I783281baeac2d10437826b2b21c5c086835ec677
 2019-06-13 10:08:05 -07:00
TreeHugger Robot
77c1c938a5 Merge "Add keylayout for Xbox One USB controller" into qt-dev 2019-06-13 16:51:03 +00:00
Julia Reynolds
dc89693c20 equals! 
Test: bugreport
Change-Id: I27bbdfe2b36b0f2e2cf6dcde6f84a3385b1ec301
 2019-06-13 12:39:07 -04:00
Yiwei Zhang
f06c22660f Merge "Merge "Game Driver: Add support for prerelease channel" into qt-dev am: ba3f191bd5 am: e92cac2b6e" into qt-r1-dev-plus-aosp 
am: af1869b387

Change-Id: Ie773e2568fd7db6151da63913fde037d16ca818c
 2019-06-13 09:12:56 -07:00