Commit Graph

403398 Commits

Author SHA1 Message Date
TreeHugger Robot
55593a983f Merge "Adding enableNightMode flag to BatterySaverPolicy." 2019-02-05 23:18:38 +00:00
TreeHugger Robot
6737cc67ce Merge "Restrict reflection access to View methods" 2019-02-05 22:54:24 +00:00
TreeHugger Robot
04c971ecf9 Merge "Implement batch horizontal advances callback" 2019-02-05 22:37:53 +00:00
TreeHugger Robot
a30095d965 Merge "Don't allow reflection on ViewConfiguration#sHasPermanentMenuKey." 2019-02-05 22:26:49 +00:00
Daniel Sandler
46454b9504 Merge "Almost forgot." 2019-02-05 22:25:02 +00:00
TreeHugger Robot
e53c2f7a0f Merge "Allow querying for multiple uids in NetworkCycleDataForUidLoader." 2019-02-05 22:11:04 +00:00
Tyler Gunn
c03701d306 [automerger skipped] Merge "Add nuisance call reporting API to Telecom." am: d6471064e9 am: 41aa3fa1bc
am: b03099d9dd -s ours
am skip reason: change_id I389617491f640afd9ca28ec3f247912365e6cc53 with SHA1 1965bb1cc2 is in history

Change-Id: I17a02da5df726f4844efd2650696d2c6bc9e4687
2019-02-05 14:02:20 -08:00
Tony Mak
f014d01cdd Merge changes from topic "action-intent"
* changes:
  Update ExtService to use suggestConversationActions
  Support intent configuration for actions
2019-02-05 21:57:31 +00:00
Tony Mak
e1a27ac030 Update ExtService to use suggestConversationActions
1. Use suggestConversationActions for both replies and actions
2. Make existing flags configurable via DeviceConfig

Test: atest SmartActionHelperTest.java
Test: atest AssistantSettingsTest.java

BUG: 123745079

Change-Id: I9b84edf9818d5839202c337ac3c3d48378adbf55
2019-02-05 21:57:20 +00:00
Tony Mak
ae33c3bd35 Support intent configuration for actions
1. Pull out the common intent genereation logic to TemplateIntentFactory,
so that it could be used by actions.

2. Fix a bug that we are freeing the annotator immediately when
   we are switching annotator model file. It is incorrect as
   it could be used by another thread / model.

Test: atest frameworks/base/core/tests/coretests/src/android/view/textclassifier/

BUG: 123745079

Change-Id: I6c5364595470b900be2dd976dda6e9fc90464de9
2019-02-05 21:53:37 +00:00
TreeHugger Robot
40c96fbc42 Merge "Remove dup import in HdmiCecLocalDeviceTest" 2019-02-05 21:49:26 +00:00
Tyler Gunn
b03099d9dd Merge "Add nuisance call reporting API to Telecom." am: d6471064e9
am: 41aa3fa1bc

Change-Id: I1a2318fb310c5c8f172a729f30e4ee8727bed0da
2019-02-05 13:48:47 -08:00
Haoyu Zhang
027b668bea Merge "Add trackNum to UnsupportedAppUsage annotation of createFromFamiliesWithDefault" 2019-02-05 21:44:54 +00:00
Tyler Gunn
41aa3fa1bc Merge "Add nuisance call reporting API to Telecom."
am: d6471064e9

Change-Id: I73211b3de4d06db13cf19c540965839f1404ffce
2019-02-05 13:39:17 -08:00
Stanley Tng
1617377d1b Merge "Update the Hearing Aids Strings" am: 3fdbf46ac1 am: aa36e0d7b0
am: 5110d23b6d

Change-Id: I2602784a871be4b286134373a1d9def6ca472d34
2019-02-05 13:31:56 -08:00
Tyler Gunn
d6471064e9 Merge "Add nuisance call reporting API to Telecom." 2019-02-05 21:23:15 +00:00
Stanley Tng
5110d23b6d Merge "Update the Hearing Aids Strings" am: 3fdbf46ac1
am: aa36e0d7b0

Change-Id: I5022edcd208b26ef2b99e13666b3925a9f2ecd2a
2019-02-05 13:15:26 -08:00
Soonil Nagarkar
11a7994c7a Merge "Add TestApi annotations to LocationManager" 2019-02-05 21:07:52 +00:00
TreeHugger Robot
250bd27338 Merge "Don't allow reflection on ScaleGestureDetector#mSpanSlop." 2019-02-05 21:06:16 +00:00
Stanley Tng
aa36e0d7b0 Merge "Update the Hearing Aids Strings"
am: 3fdbf46ac1

Change-Id: I9a6b0ba94c210976a8d4ad1934bcae0ca39a5d22
2019-02-05 13:05:09 -08:00
Ashley Rose
2879c9c95f Merge "@InspectableProperty coverage for android.widget" 2019-02-05 21:03:00 +00:00
TreeHugger Robot
03da687d5a Merge "Disable GNSS HAL when location is off" 2019-02-05 20:59:24 +00:00
TreeHugger Robot
b5c226b1ca Merge "Sharesheet - image preview support" 2019-02-05 20:55:27 +00:00
Lucas Dupin
8bb6445890 Merge "LS sensor should wake-up the wallpaper" 2019-02-05 20:35:24 +00:00
Mathieu Chartier
c9dcaeb4a5 Merge "Add view inflation device config property" 2019-02-05 20:26:07 +00:00
Treehugger Robot
3fdbf46ac1 Merge "Update the Hearing Aids Strings" 2019-02-05 20:20:51 +00:00
TreeHugger Robot
319830dce9 Merge "Renaming gpsMode to locationMode." 2019-02-05 20:16:59 +00:00
TreeHugger Robot
6a98b6d236 Merge "Add PopupMenu#setForceShowIcon" 2019-02-05 20:00:57 +00:00
Android Build Merger (Role)
b8accfe758 Merge "[automerger skipped] Merge "Migrate suspend HAL interactions to new suspend control AIDL." am: a65ac91cbd am: e88b23de0b am: a98a76e53a -s ours am skip reason: change_id I61cf05a8095f9d121fafb862def8239b325a7f43 with SHA1 c7b16ca0ab is in history" 2019-02-05 19:52:05 +00:00
Santos Cordon
be7486bbd7 [automerger skipped] Merge "Migrate suspend HAL interactions to new suspend control AIDL." am: a65ac91cbd am: e88b23de0b
am: a98a76e53a -s ours
am skip reason: change_id I61cf05a8095f9d121fafb862def8239b325a7f43 with SHA1 c7b16ca0ab is in history

Change-Id: I698f97f7ed9a1b468c38ca52f76135c06b355967
2019-02-05 11:50:19 -08:00
TreeHugger Robot
d25105a54d Merge "Restrict usage of PopupWindow::mOverlayAnchor" 2019-02-05 19:47:29 +00:00
Louis Pullen-Freilich
87dd8aa97d Merge "Adds comment to dark-greylisted mShowCursor" 2019-02-05 19:46:22 +00:00
Kweku Adams
4db6a3ca60 Adding enableNightMode flag to BatterySaverPolicy.
Also migrating UiModeManagerService to register a LowPowerModeListener
so it uses the more standard interface for Battery Saver.

Bug: 119261320
Bug: 122968431
Test: atest com.android.server.power.batterysaver.BatterySaverPolicyTest
Change-Id: I669737d5985d0b2835740a53695526a2119cdf49
2019-02-05 11:45:22 -08:00
Android Build Merger (Role)
f21ccec0fe Merge "Merge "Track Multiple Event Instances in EventReporter" am: fcd1db63bd am: bb79b309cf am: ca25a3a94a" 2019-02-05 19:41:23 +00:00
TreeHugger Robot
6745b68f81 Merge "Provide java_defaults as a counterpart to the settings.mk file" 2019-02-05 19:40:23 +00:00
Nathan Harold
62f5abdf4a Merge "Track Multiple Event Instances in EventReporter" am: fcd1db63bd am: bb79b309cf
am: ca25a3a94a

Change-Id: Ia8223f2246c33c6a232824052022ac8ff2727c41
2019-02-05 11:40:22 -08:00
TreeHugger Robot
f264eebd8e Merge "Removed the Augmented Autofill blacklist APIs." 2019-02-05 19:32:11 +00:00
Android Build Merger (Role)
2829e85221 Merge "Merge "Add a Telephony Debug Surface" am: ef4110074e am: 569a38a931 am: 2e1efa4f96" 2019-02-05 19:31:37 +00:00
Louis Pullen-Freilich
c9d007d7c9 Merge "Makes View#setTransitionVisibility public and dark-greylists mViewFlags" 2019-02-05 19:31:11 +00:00
Nathan Harold
9491f99d3a Merge "Add a Telephony Debug Surface" am: ef4110074e am: 569a38a931
am: 2e1efa4f96

Change-Id: Iaac7fee1fafcdb38a17b6e238fd2436f04af2c9f
2019-02-05 11:30:17 -08:00
TreeHugger Robot
d19aeeb3e9 Merge "Speculative fix for createBitmap crash" 2019-02-05 19:25:42 +00:00
TreeHugger Robot
ac36fd3478 Merge "Use checkOp instead noteOp for location permission checks." 2019-02-05 19:25:04 +00:00
Santos Cordon
a98a76e53a Merge "Migrate suspend HAL interactions to new suspend control AIDL." am: a65ac91cbd
am: e88b23de0b

Change-Id: Ia7ee3329eb3d7b780b4fad617d4f76a459327f73
2019-02-05 11:12:01 -08:00
Christopher Dalton
adafb1b44e Merge "Enable CCPR in Ganesh" 2019-02-05 19:11:31 +00:00
Chalard Jean
4f669f7dd7 [automerger skipped] Merge "[KA02] internal cleanup and refactor for SocketKeepalive" am: 292da961e6 am: 1732e54ca5
am: 98afe69ae9 -s ours
am skip reason: change_id Ia9917d12987e91e87e34ffb3f126e7bc7c9c187e with SHA1 e413528700 is in history

Change-Id: I6aea18280ee55740725a73d969a6485b69cb0521
2019-02-05 11:08:36 -08:00
Nathan Harold
ca25a3a94a Merge "Track Multiple Event Instances in EventReporter" am: fcd1db63bd
am: bb79b309cf

Change-Id: Icee3b6f4a437d8165483e1070fe88888879e5615
2019-02-05 11:05:23 -08:00
Soonil Nagarkar
53f4d28bd4 Merge "Remove unused API" 2019-02-05 19:03:35 +00:00
Nathan Harold
2e1efa4f96 Merge "Add a Telephony Debug Surface" am: ef4110074e
am: 569a38a931

Change-Id: I25370bfcc187646220ae4935da98cc017107a2c4
2019-02-05 10:57:15 -08:00
Soonil Nagarkar
35c3b91709 Disable GNSS HAL when location is off
Bug: 118883298
Bug: 121176514
Test: manually
Change-Id: Iedf4427d30b317fd9d2d26469b5b4a58eb477b1f
2019-02-05 10:51:58 -08:00
Yohei Yukawa
d20eef826c Query right user's system IMEs in AppRestrictionsHelper
It turns out that AppRestrictionsHelper#addSystemImes() has always
queried for the owner user's system IMEs despite the fact that it's
trying to query system IMEs for a restricted profile user.  This
behavior has not changed since its beginning [1].

Most likely people would not have noticed this though, because:

* Settings app does not show a menu item to create a restricted user
   on phone devices.
 * Even if it's available, most people do not use restricted users.
 * Even if someone created a restrected user, most likely the owner
   user and the restrected user share the same set of system IMEs,
   which are defined as "pre-installed" IMEs.

Anyway, AppRestrictionsHelper#addSystemImes() will start using a newly
introduced @hide API IMM#getEnabledInputMethodListAsUser() so that it
can query for the right user's system IMEs, instead of querying owner
user's ones.

 [1]: Ifced841ad3bfbde33d2403356216dd1749b7fa9a
      a7a93784d1f9798d37cb618def1a558f8d626f0f

Bug: 122164939
Test: atest SettingsLibTests:AppRestrictionsHelperTest
Test: manually done as follows.
  1. Build aosp_taimen-userdebug and flash it.
  2. adb shell pm create-user --restricted test_profile
  3. adb shell am start -a android.settings.USER_SETTINGS
  4. Click the gear icon next to the "test_profile" user.
  5. By adding a log, make sure that IMMS#getInputMethodList()
     gets called with userId = 10.
Change-Id: I5b50b5fe143c74c87b331bda3e5bcc4d6248436e
2019-02-05 10:45:32 -08:00