Commit Graph

864 Commits

Author SHA1 Message Date
Mark Renouf
72582bf671 Merge "Adds OnBackPressedOnTaskRoot" into qt-dev am: 1eb6476824
am: 5efa4f6a8b

Change-Id: I306b108dc45ab0dc8e3b0e4764a7660846b37c91
2019-05-07 09:47:01 -07:00
Mark Renouf
446251dc52 Adds OnBackPressedOnTaskRoot
This allows Bubbles to be collapsed instead of finished
when there is only one activity in the stack.

Bug: 126852149
Test: launch activity, press back
Change-Id: Iad8db0549853e3f385d54fc6b6cea5e502d37139
2019-05-07 10:00:07 -04:00
Dario Freni
359548050d Merge "Merge "Use updatable sysprop to for enabling APEX mgmt" into qt-dev am: ca9056eb66" into qt-dev-plus-aosp
am: 8de0b2a8bc

Change-Id: I4a933d405bcca6f6982af30d7faecca477808115
2019-05-01 09:45:33 -07:00
Zimuzo Ezeozue
62a7af0792 Merge "Change watchdog PackageInfo to PackageConfig" into qt-dev am: 0f6db7d1dd
am: a9fd8e1ff1

Change-Id: I97742a524afd91ba83a2fc56a7c0d44883452e83
2019-04-29 13:27:48 -07:00
Dario Freni
2ce84341de Use updatable sysprop to for enabling APEX mgmt
This should prevent unnecessary communication with apexd on devices that
don't support APEX package management.

Bug: 130623080
Test: CTS tests on marlin (no APEX support) and cuttlefish
Change-Id: Ic5fdb088aa1530b3c5aecbd5abd3d794a364c775
2019-04-29 17:35:16 +01:00
Zimuzo
1a9aac7b33 Change watchdog PackageInfo to PackageConfig
Test: atest PackageWatchdogTest
Bug: 131165818
Change-Id: Ie3a385468a0de05bc55862e6f71513077d44bbc0
2019-04-24 20:44:52 +01:00
Kyunglyul Hyun
3aedf02540 Media: enables MR2PS to update provider info
With this CL, MediaRoute2ProviderService can update its provider info
and publish its routes.

MediaRouter2Manager.Callback.onProviderUpdated(info) is alao added to
confirm whether correct provider info is sent.

Also, renamed the AIDLs such as
  IMediaRouter2ManagerClient -> IMediaRouter2Manager
  IMediaRoute2Callback -> IMediaRoute2ProviderClient

and changed on** to notify** in AIDLs.

Logics related to selecting/unselecting will be coverd by following CLs.

Test: atest mediaroutertest (after atest mediarouteprovider)

Change-Id: I5b119fbd0622a9422d3edf720b85e296ac4a5694
2019-04-22 20:11:47 +09:00
Chalard Jean
c3643acb8d Merge "Move TrafficStats tags for the network stack constants" into qt-dev am: e7ef0a61f2
am: c728f75abd

Change-Id: I4882686a86e7c6d42f4b0619b921d02619ed6d4c
2019-04-16 17:38:30 -07:00
Chalard Jean
e7ef0a61f2 Merge "Move TrafficStats tags for the network stack constants" into qt-dev 2019-04-16 20:30:07 +00:00
Chalard Jean
6a76b7e2e4 Move TrafficStats tags for the network stack constants
As per API council feedback, these constants should live in
a place that is private to the network stack, only with a
range defined in system API.

Bug: 129433383
Test: m
Change-Id: I84a90f84a9af6fef4667ee4d512ebd0413222086
(cherry picked from commit 79a6330650ca04bd7a08afbd63f8016a3b30bc72)
2019-04-16 00:41:54 +09:00
Kyunglyul Hyun
a1c7990bc4 DO NOT MERGE: Revert "Media: Add MediaRouterManager to control media route of other apps"
This reverts commit 1c8188f2b4.

Bug: 130511870
Test: atest android.media.cts.MediaRouterTest
Change-Id: I1de6fbeb81b1d5ef0ec4b73173b6525d4c6edc07
2019-04-15 11:44:55 +09:00
Kyunglyul Hyun
0eceec8daa Merge "DO NOT MERGE: Revert "DO NOT MERGE: Revert "Media: Add MediaRouterManager to control media route of other apps""" 2019-04-11 06:14:31 +00:00
Kyunglyul Hyun
d51666de42 DO NOT MERGE: Revert "DO NOT MERGE: Revert "Media: Add MediaRouterManager to control media route of other apps""
This reverts commit dd3f305bb3.

Reason for revert: wrong branch

Change-Id: Ic9b6d17af8e967ec73a9dac141c60e02195a8d19
2019-04-11 04:10:25 +00:00
Kevin Chyn
2ea5c096d7 Merge "Handle cancellation properly for setDeviceCredentialAllowed(true)" into qt-dev am: 76d5454a86
am: 858049a622

Change-Id: If6775a829712c6224bdc11de6d9aae5f792c4608
2019-04-10 03:54:16 -07:00
Kevin Chyn
76d5454a86 Merge "Handle cancellation properly for setDeviceCredentialAllowed(true)" into qt-dev 2019-04-10 08:34:34 +00:00
Kevin Chyn
5a90a653f5 Handle cancellation properly for setDeviceCredentialAllowed(true)
Keep the current auth session until ConfirmDeviceCredential succeeds
or fails. ConfirmDeviceCredential's BP and LSKF screens can be canceled
now.

Bug: 123378871
Bug: 128747871

Test: With modified BiometricPromptDemo, ConfirmDeviceCredential's
      BiometricPrompt and LSKF screens can be canceled

Change-Id: Icaf3f0c55b07fd138a2ee9d214941ea83408f0ee
2019-04-09 22:04:05 -07:00
Kyunglyul Hyun
dd3f305bb3 DO NOT MERGE: Revert "Media: Add MediaRouterManager to control media route of other apps"
This reverts commit 1c8188f2b4.

Test: atest android.media.cts.MediaRouterTest
Change-Id: I1de6fbeb81b1d5ef0ec4b73173b6525d4c6edc07
2019-04-10 11:56:00 +09:00
Joe Onorato
1be371ddbd Merge changes I9706478e,I3fe2dea3,Ic65566c0 into qt-dev
* changes:
  Make libplatformprotos-static, which is safe to use when you don't have shared libraries.
  Add additional system properties that can disable the face debugging codepath
  Fix mMaxOffset not initialized.
2019-04-05 21:29:24 +00:00
Zimuzo
cd6b11575f Add supported PackageInfo to ExplicitHealthCheckService API
With the change in I4f13638598037acaeb30d61c8d5178f45882fcba
to separate the PackageWatchdog package expiry deadline from the explicit
health check deadline. It would be cleaner for ExtServices to supply
this deadline per-package. We now do that as a field in
PackageInfo.

Bug: 120598832
Test: Builds

Change-Id: I29e2d619a5296716c29893ab3aa2f35f69bfb4d7
2019-04-05 16:05:45 +00:00
Joe Onorato
9bd5db7a68 Make libplatformprotos-static, which is safe to use when you don't have shared libraries.
Bug: 123543706
Test: treehugger
Change-Id: I9706478e99bee914b200a39f08274ecc2dc07951
2019-04-04 21:44:03 -07:00
Yohei Yukawa
49efa718a8 Introduce a result class for IStatusBarService#registerStatusBar()
This is a preparation to fix an issue that IME cannot enable light
navigation bar on direct-reply.

The initial state of StatusBar client is provided as return values of
IStatusBarService#registerStatusBar().  However, the way for the
client to receive the return values is to rely on "out" parameters in
the Binder method as follows.

    void registerStatusBar(IStatusBar callbacks,
            out List<String> iconSlots,
            out List<StatusBarIcon> iconList,
            out int[] switches,
            out List<IBinder> binders,
            out Rect fullscreenStackBounds,
            out Rect dockedStackBounds);

The issue is that if I want to add a new parameter into
StatusBarManagerService to fix Bug 122439339, then it needs to be
notified back to the client via one of these out values, e.g. a new
element in "switches", which is hard to understand and maintain.

It'd be better to introduce a dedicated return object as follows.

    RegisterStatusBarResult registerStatusBar(IStatusBar callbacks);

This is a purely mechanical code clean-up.  Hence there should be no
behavior change.

Bug: 122439339
Test: presubmit
Change-Id: Ib1c0ae8f591ca09d0bce7a39f85ba57aad386e47
2019-04-04 11:49:02 -07:00
Michael Wright
c7995239ef Expose input region monitoring to system components.
This is to allow SysUI to detect system-wide gestures.

Test: manual
Bug: 123748692
Change-Id: Ic1e2cd6afea219d0e20b29e7150c9a42b75c7a67
2019-04-03 13:46:30 +01:00
Joe Onorato
99598ee6ee incidentd can now handle multiple callers asking it for incident reports
Test: bit incident_test:* GtsIncidentManagerTestCases:*
Bug: 123543706
Change-Id: I9f671dd5d8b2ad139f952a23e575c2be16120459
2019-03-26 11:20:48 -07:00
Kyunglyul Hyun
2d70f04a1d Merge "Media: Add MediaRouterManager to control media route of other apps" 2019-03-25 23:39:34 +00:00
Zimuzo Ezeozue
245e9c0af9 Merge "Add ExplicitHealthCheckService API" 2019-03-25 19:46:10 +00:00
Zimuzo
a3bb67d1ed Add ExplicitHealthCheckService API
The ExplicitHealthCheckService implementation will live in ExtServices
so it can be updated outside of a platform update. It will contain
logic to assist the PackageWatchdog with observing packages, e.g
ensuring that the device can successfully connect to WiFi after a
mainline update.

Test: Builds
Bug: 120598832
Change-Id: If658567ca41bb0328e279735897fc50ab76abc11
2019-03-25 16:25:30 +00:00
Andrei-Valentin Onea
ed37f17a3b Merge changes from topic "android-internal-srcs"
* changes:
  Add @UnsupportedAppUsage annotations
  Add android internal dirs to hiddenapi-mappings
2019-03-25 13:57:20 +00:00
Andrei Onea
77b22e33b6 Add android internal dirs to hiddenapi-mappings
Bug: 110868826
Test: m hiddenapi-mappings
Change-Id: Ie13962cc6a58af88e63a95c7f0d846aceda11f53
2019-03-22 17:23:10 +00:00
TreeHugger Robot
c396d6738c Merge "API review followup: DynamicAndroidClient" 2019-03-22 17:21:39 +00:00
Lorenzo Colitti
404a526672 resolve merge conflicts of 0569184dc0 to master
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I3af8ee8a7d8a4ff9dca0195b1947679cc09b2e89
2019-03-22 12:02:50 +09:00
Lorenzo Colitti
9b86ed3c65 Merge changes I2e8c2ad9,Ic4f4c7d2
am: 0c089bcc82

Change-Id: I09d0c721fc8d9755b9310bbe252aa45ab9f147f2
2019-03-21 17:39:56 -07:00
Lorenzo Colitti
306e8cd9e7 Move the networkstack AIDL interfaces to services/net.
Nothing in the framework uses these, so there is no point in
having the build be in frameworks/base/Android.bp.

Fix: 128804404
Test: builds, boots
Test: atest FrameworksNetTests
Change-Id: I2e8c2ad9ea8bfcd3668a83e4c044de10389a8a22
2019-03-21 23:23:57 +09:00
Lorenzo Colitti
ede75b5f93 Remove the framework dependency on networkstack-aidl-framework.
This dependency is unused because the only file it contains is
only used by services.net, which already depends on it via the
networkstack-aidl-interfaces rule.

In its own change because it conflicts in internal master.

Test: m
Bug: 128804404
Change-Id: Ic4f4c7d2f7de06f75344946345684f26f1e05932
Merged-In: Ic4f4c7d2f7de06f75344946345684f26f1e05932
2019-03-21 23:14:12 +09:00
Andrei-Valentin Onea
e9e1886860 Merge "Add telephony sources to hiddenapi-mappings" 2019-03-21 13:22:55 +00:00
Po-Chien Hsueh
4e908c24ca API review followup: DynamicAndroidClient
Some API changes per API reivew:
- Move DynamicAndroidClient and ~Manager to android.os.image.
- Rename them to DynamicSystemClient and ~Manager.
- Rename permission MANAGE_DYNAMIC_ANDROID to MANAGE_DYNAMIC_SYSTEM
- Corresponding changes in the installation service.
- Corresponding changes in privapp-permissions-platform.xml.
- Add missing annotations.
- Change setOnStatusChangedListener's parameters order.
- Improve documentations.
- Re-generate api/system-current.txt.

Bug: 126613281
Test: adb shell am
Change-Id: Ia920e9ccf6de1dbbd38c52910cb72cb81b9b5b32
2019-03-21 17:25:59 +08:00
Lorenzo Colitti
834f512e0e Merge "Remove the framework dependency on networkstack-aidl-framework." 2019-03-21 00:20:22 +00:00
Steven Moreland
506dd4a297 Merge "Remove telephony-common classes." am: 6d77176920 am: bfed6db4e1
am: 76ff86d56a

Change-Id: I43a4022c8c6f723098643faaa21e4b3f63ebf96c
2019-03-20 12:18:23 -07:00
Steven Moreland
bfed6db4e1 Merge "Remove telephony-common classes."
am: 6d77176920

Change-Id: I04c352cc56f66b06142c9a94f0b7ca7d51b26195
2019-03-20 11:46:35 -07:00
Steven Moreland
6d77176920 Merge "Remove telephony-common classes." 2019-03-20 18:30:10 +00:00
Andrei Onea
6dd843a6b2 Add telephony sources to hiddenapi-mappings
This makes it possible to annotate telephony greylisted apis in
frameworks/opt/telephony.

Test: m hiddenapi-mappings
Bug: 110868826
Change-Id: I1f7d2722bd7621c9f6d1195ea212a7a0454d560d
2019-03-20 15:30:49 +00:00
Adrian Roos
5f9ec2c1c6 Merge "Gestures: Assemble per-window exclusion zones" 2019-03-20 15:28:03 +00:00
Lorenzo Colitti
48b1446b93 Remove the framework dependency on networkstack-aidl-framework.
This dependency is unused because the only file it contains is
only used by services.net, which already depends on it via the
networkstack-aidl-interfaces rule.

In its own change because it conflicts in internal master.

Test: m
Bug: 128804404
Change-Id: Ic4f4c7d2f7de06f75344946345684f26f1e05932
2019-03-20 21:59:41 +09:00
Lorenzo Colitti
be2028471f Merge changes from topic "framework-no-networkstack-aidl"
am: 74867d1661

Change-Id: I13ba3cb016a63353cfa62a61106d16e30eff0076
2019-03-20 03:18:47 -07:00
Lorenzo Colitti
9a4ae2c3f1 Remove the framework dependency on netd_aidl_parcelables-java.
In its own change because it conflicts in internal master.

Test: m
Bug: 128804404
Change-Id: I74531ef11d504b232d4f377532d5e0812dbc88db
Merged-In: I74531ef11d504b232d4f377532d5e0812dbc88db
2019-03-20 08:56:31 +09:00
Lorenzo Colitti
59d474b3c2 Remove the framework dependency on netd_aidl_parcelables-java.
In its own change because it conflicts in internal master.

Test: m
Bug: 128804404
Change-Id: I74531ef11d504b232d4f377532d5e0812dbc88db
2019-03-20 00:49:33 +09:00
Xiao Ma
2ce206c82d Merge "Move the IpMemoryStore to the network stack." am: 93bf5ef495 am: 5db1518bfa
am: 3176d57308

Change-Id: I243056012d2f099d96a33657c0eb63a5b66a2cfe
2019-03-19 06:54:43 -07:00
Xiao Ma
5db1518bfa Merge "Move the IpMemoryStore to the network stack."
am: 93bf5ef495

Change-Id: I672d07ca2d0a251c246993ab8c7c3075de385570
2019-03-19 06:35:31 -07:00
Xiao Ma
93bf5ef495 Merge "Move the IpMemoryStore to the network stack." 2019-03-19 13:21:12 +00:00
Jeongik Cha
f34cc1d6dc Merge "Set sdk_version 28 in aidl_interface" am: 353e36fe69 am: 43942ab500
am: 35b92a4598

Change-Id: I4c5e8a59c05127224506825c169d05d286571712
2019-03-18 16:28:45 -07:00
Jeongik Cha
43942ab500 Merge "Set sdk_version 28 in aidl_interface"
am: 353e36fe69

Change-Id: Ie532df169167d94df55c3a496349b96db6abbd52
2019-03-18 15:51:30 -07:00