355844 Commits

Author SHA1 Message Date
Brad Ebinger
264625486b Integrate ImsCallSessionListener API changes
Integrates the ImsCallSessionListener API changes.
This involves:

1) Moving the ImsCallSessionListener to the
android.telephony.ims namespace.
2) Creating a compat layer between the old
IImsCallSessionListener AIDL and the new one
for vendors using the old implementation.
3) Modify ImsCallSession to only use
setListener to set ImsCallSessionListener
(other method was never used in our code).

Test: Telephony Unit Tests, Manual IMS Tests
Bug: 63987047

Change-Id: I4378c0b1d68ff4f5f21815c81af52c03a66f81c5
2018-01-25 10:50:43 -08:00
TreeHugger Robot
29a18c1101 Merge "Adding privacy tags to PowerManagerService proto." 2018-01-25 18:16:35 +00:00
Artem Iglikov
0edd645492 Merge "Revert "Make idiomatic use of ApkAssets and AssetManager"" 2018-01-25 18:06:49 +00:00
TreeHugger Robot
48726eae32 Merge "Remove unused system api Window.setDisableWallpaperTouchEvents" 2018-01-25 18:05:15 +00:00
TreeHugger Robot
50bdbe3e2f Merge "Add key to store location changer" 2018-01-25 17:59:24 +00:00
TreeHugger Robot
5b6eaf209c Merge "Add support for UsbDeviceManager to talk to USB GADGET HAL" 2018-01-25 17:57:35 +00:00
TreeHugger Robot
f1b720c488 Merge "Skip priv app full apk verification if has verify" 2018-01-25 17:52:25 +00:00
TreeHugger Robot
c86a420c6e Merge "Finish broadcast radio HAL 2.0 radio service." 2018-01-25 17:49:26 +00:00
TreeHugger Robot
4dadff8be0 Merge "Add confirmation UI protocol to Keystore AIDL definition" 2018-01-25 17:31:38 +00:00
TreeHugger Robot
7f1e49f2ff Merge "Generating StrongBox backed keys" 2018-01-25 17:24:17 +00:00
TreeHugger Robot
0ad372a7e4 Merge "Fix context menu position for RTL" 2018-01-25 17:18:23 +00:00
TreeHugger Robot
3bcddc94ac Merge "Chained attribution for GnssLocationProvider." 2018-01-25 17:14:11 +00:00
TreeHugger Robot
f8fc7235d4 Merge "Display proper block text for blocking helper" 2018-01-25 17:02:24 +00:00
TreeHugger Robot
f39867e610 Merge "MediaSession2: Apply apilint" 2018-01-25 16:52:19 +00:00
TreeHugger Robot
1d92689eee Merge "Add QS scrolling support" 2018-01-25 16:50:16 +00:00
TreeHugger Robot
97ce94fce6 Merge "Add BinderProxy tracking code to SysUI." 2018-01-25 16:48:31 +00:00
Michal Karpinski
3b6be64e85 Merge "Deprecate BackupManager#requestRestore()" 2018-01-25 16:46:25 +00:00
Andreas Gampe
5baf96a070 Merge "PrintSpooler: Fix EqualsNaN in test" am: ffcf3ff77d am: 57f653a155
am: b328fbc6b8  -s ours

Change-Id: If5a7d31d7ce73b3b3309434bb05ac1a6aeee574f
2018-01-25 16:31:58 +00:00
TreeHugger Robot
83e2e71152 Merge "Fixed AUTOFILL_SERVICE_DISABLED_APP and AUTOFILL_SERVICE_DISABLED_ACTIVITY." 2018-01-25 16:15:29 +00:00
Wale Ogunwale
20f65bbdcd Remove unused system api Window.setDisableWallpaperTouchEvents
Test: builds
Change-Id: Ifd3e271a4af0bc4066747be9a147470498c39e5b
Fixes: 62263432
2018-01-25 08:12:48 -08:00
Andreas Gampe
b328fbc6b8 Merge "PrintSpooler: Fix EqualsNaN in test" am: ffcf3ff77d
am: 57f653a155

Change-Id: I03dee58beeb6247a7786fef455eae646fb243121
2018-01-25 16:10:00 +00:00
TreeHugger Robot
1e7f8014a8 Merge "Binding on-demand #12: Log and unbind dangling TransportClients" 2018-01-25 16:08:15 +00:00
Android Build Merger (Role)
6fef13975a Merge "Merge "Update CellInfo API to accomodate new fields." am: 7e73c73f89 am: 4dac182030 am: 55373d0549" 2018-01-25 16:08:00 +00:00
Selim Cinek
d41477f494 Merge changes from topic "notification_launch"
* changes:
  Added the reply draft as an extra to the content intent
  Launching notification settings correctly inline
  Launching Notification animations inline
2018-01-25 16:05:15 +00:00
Eric Schwarzenbach
fd4881c53f Merge "Update CellInfo API to accomodate new fields." am: 7e73c73f89 am: 4dac182030
am: 55373d0549

Change-Id: I39620f4dd3afd57835c1c48e36e94f8028102edb
2018-01-25 16:05:05 +00:00
Jorim Jaggi
8e725bbad2 Merge changes Id2832518,Ic8c128ed,Id8fde482,I99cc170b
* changes:
  Revert "1/ Create display content window controller to position stacks in the display"
  Revert "2/ Add support for remote Recents animation"
  Revert "3/ Add input consumer to capture touches during a Recents transition"
  Revert "4/ Update SysUI shared lib for Recents transition"
2018-01-25 16:03:21 +00:00
TreeHugger Robot
04d0d0031a Merge "WebView: document Safe Browsing as 'on' by default" 2018-01-25 16:00:00 +00:00
Android Build Merger (Role)
20b9219eda Merge "Merge "Create hidden API lists" am: b6a5c92b50 am: 265863f9d9 am: a5cc0bb027" 2018-01-25 15:58:09 +00:00
TreeHugger Robot
17c8e6138e Merge "QS dnd tile triggerd dialog to turn on dnd" 2018-01-25 15:57:35 +00:00
David Brazdil
e87f629e8c Merge "Create hidden API lists" am: b6a5c92b50 am: 265863f9d9
am: a5cc0bb027

Change-Id: I6e85de117103f62cea394f7d00478ffba3ea0622
2018-01-25 15:57:31 +00:00
Andreas Gampe
57f653a155 Merge "PrintSpooler: Fix EqualsNaN in test"
am: ffcf3ff77d

Change-Id: I4c803259d993c51790c4b960251dde3a2bea9db9
2018-01-25 15:53:05 +00:00
Shuzhen Wang
68dcd18392 Merge "camera2: Add physical camera id in CaptureResult" 2018-01-25 15:52:45 +00:00
Eric Schwarzenbach
79f2ea2d7d Merge "Add ServiceState APIs for carrier aggregation." am: 185a89caf1 am: d529242eea
am: a0414ed567

Change-Id: I09b5a5955ace18d045f20a5d39b93d8e30096816
2018-01-25 15:51:19 +00:00
Eric Schwarzenbach
55373d0549 Merge "Update CellInfo API to accomodate new fields." am: 7e73c73f89
am: 4dac182030

Change-Id: Ifef2f68a49fb74c11fb845590e08040972f7d27b
2018-01-25 15:49:59 +00:00
Robert Berry
903b092cd6 Merge "Add flag indicating transport is device-to-device transfer" 2018-01-25 15:41:18 +00:00
David Brazdil
a5cc0bb027 Merge "Create hidden API lists" am: b6a5c92b50
am: 265863f9d9

Change-Id: I4d32dccc7c00216102b6bd91ed1f185c03c2c048
2018-01-25 15:33:47 +00:00
Daniel Sandler
cafaafcd82 Merge "Apply user sentiment on ranking update." 2018-01-25 15:33:37 +00:00
TreeHugger Robot
78bf68c4f2 Merge "Display the current connected audio device" 2018-01-25 15:32:35 +00:00
Malcolm Chen
58b90eb578 Merge "Add slotId in INetworkService.aidl methods." am: b1c6aa4567 am: 9348e258cd
am: 6ec70f018e

Change-Id: Ifbbdd159c3cd52282d6a4bdd58c1ddeeff4cc912
2018-01-25 15:30:37 +00:00
Eric Schwarzenbach
a0414ed567 Merge "Add ServiceState APIs for carrier aggregation." am: 185a89caf1
am: d529242eea

Change-Id: Id55c68bed1fceff1d6d83793b190188b42d99435
2018-01-25 15:23:48 +00:00
TreeHugger Robot
88ffa32cad Merge "WebView: fix docs for setAllow*AccessFromFileUrls" 2018-01-25 15:23:27 +00:00
Eric Schwarzenbach
4dac182030 Merge "Update CellInfo API to accomodate new fields."
am: 7e73c73f89

Change-Id: Ib82c77d3b5559d593dbb3181add634eee251f53b
2018-01-25 15:23:20 +00:00
Malcolm Chen
6ec70f018e Merge "Add slotId in INetworkService.aidl methods." am: b1c6aa4567
am: 9348e258cd

Change-Id: I0dba0926979d53951cea53761a4527b246fcb98e
2018-01-25 15:19:06 +00:00
David Brazdil
265863f9d9 Merge "Create hidden API lists"
am: b6a5c92b50

Change-Id: I176c79560b1cc74182de4cf080b105fc91afce22
2018-01-25 15:14:58 +00:00
Narayan Kamath
5bc5457ae5 Merge "Support logging chained WorkSources from JobScheduler." 2018-01-25 15:13:19 +00:00
Eric Schwarzenbach
d529242eea Merge "Add ServiceState APIs for carrier aggregation."
am: 185a89caf1

Change-Id: I15e52f02c204805efacbd22eaad9a1e7218ff3ca
2018-01-25 15:09:59 +00:00
Malcolm Chen
9348e258cd Merge "Add slotId in INetworkService.aidl methods."
am: b1c6aa4567

Change-Id: I950f4617cbe6abcd8c943e1cc0b5aba60163f202
2018-01-25 15:06:59 +00:00
Treehugger Robot
ffcf3ff77d Merge "PrintSpooler: Fix EqualsNaN in test" 2018-01-25 15:05:27 +00:00
Badhri Jagan Sridharan
6754ca81c2 Add support for UsbDeviceManager to talk to USB GADGET HAL
Till now, Init scripts(property tiggers) are used define the
operation that needs to be performed when a certain gadget
composition needs to be enabled. Based on the user preference,
usb service sets the sys.usb.config which triggers the
corresponding property triggers in init scripts and usbservice
polls on sys.usb.state to infer whether the property triggers
have completed executing.

This CL makes UsbHandler class abstract to make init scripts
based legacy implementation and HAL based implementation to
share the common logic. The legacy init script based logic is
implemented by UsbHandlerLegacy and HAL based logic is implemented
by UsbHandlerHal. The decision on which one to initialize is
made depending on whether the device has Gadget HAL impelemented.

Since HIDL supports asynch calbacks, usb state management is moved
to the message queue to avoid polling incase of HAL based
implementation.

To switch to a new configuration:
1. UsbService calls setCurrentUsbFunctions and queues
   MSG_SET_FUNCTIONS_TIMEOUT
2. If the  setCurrentUsbFunctionsCb arrives on time,
   then  MSG_SET_FUNCTIONS_TIMEOUT is cancelled and
   default functions are retried by queueing
   MSG_SET_DEFAULT_FUNCTIONS if SUCCESS is not signalled.
3. If MSG_SET_FUNCTIONS_TIMEOUT gets executed, then,
   default functions are retried by calling
   setEnabledFunctions(null, false, mUsbDataUnlocked);

Also, for HAL based implementation config_oemUsbModeOverride is no
longer needed as hal can take of enabling oem specific functions.

Bug: 63669128
Test: Tested usb gadget configuration for both cases:
1. When gadget hal is present
2. When gadget hal is not present
Change-Id: Ifcef464a0b97b265872696346a76162f8e84d6c0
2018-01-25 14:42:42 +00:00
Jorim Jaggi
7ef6d33718 Revert "1/ Create display content window controller to position stacks in the display"
This reverts commit 343f65a43039036896a1d550c49f2f71fea5047c.

Breaks presubmits.
2018-01-25 15:22:07 +01:00