Commit Graph

383 Commits

Author SHA1 Message Date
Yuzhou Jia
35339498ef Merge "Make Changes to VoiceInteraction API for supporting System checking an assistant voice action availability on AAE." 2018-09-20 01:02:44 +00:00
jiayuzhou
21a353b701 Make Changes to VoiceInteraction API for supporting System checking
an assistant voice action availability on AAE.

Test: build and test on AAE.
Bug: 110587280

Change-Id: If37036e0dbe021fee9c95caf7e450330ca24ae32
2018-09-19 10:21:59 -07:00
Nan Zhang
4881262573 Merge "Enable jdiff for api-stubs-docs" am: 61d0ec49ef am: f886bc1a94
am: aab7836c24

Change-Id: Id4dc90a8d4c3cf5c8231676df6c1db69d56050bd
2018-09-18 23:02:26 -07:00
Nan Zhang
aab7836c24 Merge "Enable jdiff for api-stubs-docs" am: 61d0ec49ef
am: f886bc1a94

Change-Id: I43ef41ee14d0ba434a5783f9b3daf944f30bd542
2018-09-18 22:33:50 -07:00
Nan Zhang
f886bc1a94 Merge "Enable jdiff for api-stubs-docs"
am: 61d0ec49ef

Change-Id: I0eae62d725ddefa6ef719b8d34eb1ca9eb8a7b41
2018-09-18 22:15:43 -07:00
Treehugger Robot
61d0ec49ef Merge "Enable jdiff for api-stubs-docs" 2018-09-19 03:02:19 +00:00
Nan Zhang
1774082767 Merge "Enable api-versions.xml generation for api-stubs" into stage-aosp-master am: f46a3a3acc
am: 4127448aa7

Change-Id: I1a308ab34a49a94241bc3989f8109526a184a18f
2018-09-18 18:18:40 -07:00
Nan Zhang
4127448aa7 Merge "Enable api-versions.xml generation for api-stubs" into stage-aosp-master
am: f46a3a3acc

Change-Id: Ic144a897c4d6b96945cd8a4e878f5b2fed2afa4f
2018-09-18 18:00:46 -07:00
TreeHugger Robot
f46a3a3acc Merge "Enable api-versions.xml generation for api-stubs" into stage-aosp-master 2018-09-19 00:44:11 +00:00
Nan Zhang
91cc76631e Enable api-versions.xml generation for api-stubs
Test: m -j
out/target/common/obj/PACKAGING/api-stubs-docs_generated-api-versions.xml
Bug: b/78245848

Change-Id: I2800f49e264473f5ec78e074cfd844c72342522f
2018-09-18 12:45:02 -07:00
Pete Gillin
50df226b69 Merge "Rename the ojluni-annotated-stubs target." am: 542d032f03 am: cddbd39be7
am: 59fa25a5f5

Change-Id: Idd9e6ee25e60b9882f3992cf1b19f929eca37621
2018-09-18 11:20:16 -07:00
Pete Gillin
59fa25a5f5 Merge "Rename the ojluni-annotated-stubs target." am: 542d032f03
am: cddbd39be7

Change-Id: I2c512a54b8bb3a0824ea1c279ca67e52a23f4a18
2018-09-18 11:01:52 -07:00
Nan Zhang
81f29f5cd6 Enable jdiff for api-stubs-docs
And also clean legacy MK code in Android.mk

Test: api-stubs-docs-diff
Bug: b/78245848
Change-Id: I733e0e2c29f8273db3ffb9730c70d5b4e2b1438d
2018-09-17 15:29:11 -07:00
Pete Gillin
ff97819d8b Rename the ojluni-annotated-stubs target.
All of the annotations under this are intended for use in the SDK. In
order to make this clear (because other types of annotations are
planned), this change renames the target to
ojluni-annotated-sdk-stubs.

Bug: 115746226
Test: `make api-stubs-docs`
Change-Id: I11366b6293b681cb4c8118fc117601a671c33282
2018-09-17 16:35:59 +01:00
Nan Zhang
7ae5a1e47f Merge "Migrate all offline/online sdk docs generation to use Metalava" am: 741521940a am: 8a1bb5f429
am: cebca6f778

Change-Id: Ia29f2051519738494c0ca4bae251704452dc439d
2018-09-13 17:47:05 -07:00
Nan Zhang
cebca6f778 Merge "Migrate all offline/online sdk docs generation to use Metalava" am: 741521940a
am: 8a1bb5f429

Change-Id: Id20e302216639fb78a860673abf244229358a7f5
2018-09-13 17:33:17 -07:00
Nan Zhang
7764a4b84f Migrate all offline/online sdk docs generation to use Metalava
These targets all depend on libcore sources which are blocker for us to
enable java9 feature, so convert them to Metalava.

Also enable API level annotations for api-stubs-docs, offline-sdk-docs,
and online-sdk-docs.

Test: m -j docs
Bug: b/78245848
Change-Id: I354d699a79cc5e6580b50e0613e7602c77b9c0b5
2018-09-12 16:31:49 -07:00
Nan Zhang
9a9f44c010 Merge "For metalava target, use droidstubs instead of droiddoc" am: 5eb84c0065 am: b910944852
am: 520267b93f

Change-Id: I71efe4a921fe3a03f90b90870b400d242acf5eb1
2018-09-12 15:57:56 -07:00
Nan Zhang
520267b93f Merge "For metalava target, use droidstubs instead of droiddoc" am: 5eb84c0065
am: b910944852

Change-Id: I41e110dee813021552fee125ddbcbdbaba2d6703
2018-09-12 15:08:04 -07:00
Nan Zhang
894c9ec583 For metalava target, use droidstubs instead of droiddoc
droidstubs is used to generate stubs files only.

Test: m -j api-stubs-docs
Bug: b/8d0763849
Change-Id: Ia7c3d19ed2ec7b0f5b96008e5780dbcd5a32402b
2018-09-11 15:41:50 -07:00
Dongwon Kang
1941814f8e Merge "MediaPlayer2: use protobuf instead of parcel in invoke()" 2018-09-10 18:32:32 +00:00
TreeHugger Robot
826a36c19b Merge "Add a new Binder interface to allow IMS to directly talk to IMMS" 2018-09-07 02:11:07 +00:00
Treehugger Robot
f4fc71f370 Merge "Build android.test.* with java_sdk_library" 2018-09-07 01:01:59 +00:00
Sooraj Sasindran
d71ccc543e Merge "Introduce AlternativeNetworkAccess APIs" 2018-09-06 20:32:01 +00:00
Yohei Yukawa
c54c117164 Add a new Binder interface to allow IMS to directly talk to IMMS
Historically, InputMethodService (IMS) has relied on
InputMethodManager's hidden methods to communicate with
InputMethodManagerService (IMMS).  Because of this, InputMethodManager
(IMM) has ended up being a mixture of IPC endpoint for both IME
clients and IME itself.

There are multiple problems.

 * IMM is instantiated in almost all user mode processes.  This means
   that unnecessary IPC endpoints have been accessible to them via
   reflection.  Even though those endpoints refuses request without a
   valid IME window token, and even though we have tighten up use of
   private APIs in the runtime level, exposing unnecessary IPC
   endpoints is still questionable.
 * Mixing multiple responsibilities has been caused unnecessary
   complexity in IMM.  In Bug 70282603, we have moved some APIs from
   IMM to IMS to sort out this complexity that are surfaced in API
   boundary, but in the implementation level everything remained to be
   the same.

Now that Bug 70282603 is fixed, the natural next step is to start
implementing actual an IPC connection from IMS to IMMS without relying
on IMM.

Here is the new diagram that describes (most of) IPC interfaces around
IMEs.

   APP---(1)---IMMS
     \          |
      \         |
       \        |
        \       |
         \      |
         (2)   (3)
           \    |
            \   |
             \  |
              \ |
               \|
               IME

 (1): IInputMethodManager.aidl: send requests from APP to IMMS
      IInputMethodClient.aidl:  send requests from IMMS to APP
 (2): IInputMethodSession.aidl: send requests from APP to IME
      IInputContext.aidl:       send requests from IME to APP
       -> this is the actual interface behind InputConnection
 (3): IInputMethod.aidl:        send requests from IMMS to IME
      IInputMethodPrivilegedOperations.aidl:
                                send requests from IME to IMMS

IInputMethodPrivilegedOperations.aidl is what this CL is adding.

With that, this CL moves 5 IPC methods
  from IInputMethodManager.aidl (1)
  to IInputMethodPrivilegedOperations.aidl (3).

There remain some IPC methods that are intended to be used only from
IMEs in IInputMethodManager.aidl because those methods have been
unfortunately exposed via public APIs in InputMethodmanager.

Although all of those public APIs were deprecated in Android P as part
of Bug 70282603, we still need to keep maintaining those APIs until
(most of) IMEs migrate to APIs that are newly introduced in
InputMethodService.  It would take several years.

IInputMethodManager#getInputMethodWindowVisibleHeight() is another
method that we cannot migrate right now because some apps have already
relied on its corresponding hidden method in IMM, as discussed in Bug
113914148.

Fix: 113177698
Test: atest CtsInputMethodTestCases CtsInputMethodServiceHostTestCases
Change-Id: I2f3ec3c5de546fb3603275a4b64000ed3f863b65
2018-09-06 11:39:50 -07:00
Sooraj Sasindran
165c9e90fb Introduce AlternativeNetworkAccess APIs
Introduce AlternativeNetworkAccess APIs

Bug: 113106744
Test: Verified using test app to make api calls
Change-Id: I7f470cd6028a12cc66a660d58720f803271d38eb
2018-09-06 10:32:56 -07:00
Mathew Inwood
88924e0e24 Merge "Processor for @UnsupportedAppUsage annotations." am: e5440456ca am: 22ea0b7a52
am: d20588332d

Change-Id: I097550eeaf0307e3518aaf2d8e3f30338f9fa9dc
2018-09-05 10:01:21 -07:00
Mathew Inwood
d20588332d Merge "Processor for @UnsupportedAppUsage annotations." am: e5440456ca
am: 22ea0b7a52

Change-Id: I0fd41ccc78872eae55e8341a8a38d6c6b39e0114
2018-09-05 09:43:35 -07:00
Mathew Inwood
bad89e5e5b Processor for @UnsupportedAppUsage annotations.
The processor outputs unsupportedappusage_index.csv, containing source
position info for every@UnsupportedAppUsage annotation processed. It is a
mapping of dex signature to the source postion of the annotation on that
signature. It is used as input for scripts which update the annotations.

We include a META-INF file which causes the compiler to automatically
pick up the annotation processor. Otherwise we would need to explicitly
specify the processor with a -processor flag to javac.

We create a new build target for just the @UnsupportedAppUsage annotation
and the @IntDef annotation (which it depends on) so that the processor can
also depend on that directly.

The processor only runs on a new build target framework-annotation-proc
so that it is not invoked as part of a regular build. This is done so
that we don't slow down peoples builds: Soong does not support annotation
processors when javac sharding is in use. This workaround can be removed
once b/77284273 is fixed.

Test: m framework-annotation-proc
Bug: 113853502

Change-Id: Ie9cd5a90ddf7a51f6035e849703fc39ad9127557
2018-09-05 15:01:21 +01:00
TreeHugger Robot
0df9368b0f Merge "Build android.test.* with java_sdk_library" into pi-dev-plus-aosp 2018-09-03 01:06:33 +00:00
TreeHugger Robot
f75320d841 Merge "Add an enum file for stats event" 2018-09-01 04:21:20 +00:00
sqian
1b4f1de0a7 Merge "Call Redirection Surface in Telecom out going call flow" am: 11486bfab2
am: 54016bdbca

Change-Id: I30adaf5566a55aa867f859b42a49bbbfb0b8d651
2018-08-31 18:04:17 -07:00
Howard Ro
0546d54fb4 Add an enum file for stats event
The list of events in this file is meant to be used with Generic Atom
defined in atoms.proto in statsd. Instead of unique int, we would like
to log it with an enum that shows semantic meaning of events. Also, this
change re-sorts imports and removes unused imports and remove the
previous logging line to test GenericAtom.

Test: statsd_test
Change-Id: Ia9335e48ada68bee6d716ad4d7ac50238932da95
2018-08-31 16:21:28 -07:00
sqian
cae1f264b9 Call Redirection Surface in Telecom out going call flow
- Provide a Call Redirection API Surface
- Provide a key "KEY_CALL_REDIRECTION_SERVICE_COMPONENT_NAME_STRING"
  in the CarrierConfigManager
- Create .aidl interfaces for Call Redirection
(CallRedirectionService.aidl, CallRedirectionAdapter.aidl)

Bug: 64959558
Test: Compile
Change-Id: Ic119fa445e66f1275eabf944c77fdc981bc9a2a7
Merged-In: Ic119fa445e66f1275eabf944c77fdc981bc9a2a7
(cherry picked from commit ea8970cd55)
2018-08-31 12:59:40 -07:00
Nan Zhang
8971d804ee Merge "[Vendor] Add filegrouop for NonNull.java" into pi-dev-plus-aosp
am: 5124226629

Change-Id: I639c521a1d659a3c0f83e16b248b37d68ac15567
2018-08-31 11:24:02 -07:00
Nan Zhang
af2513048e [Vendor] Add filegrouop for NonNull.java
This is needed by google.camera.experimental docs.

Test: m -j docs
Bug: b/70351683

Change-Id: I79b3f0946a1d606cda770eabe7c287f4cc207bfc
2018-08-30 14:53:06 -07:00
Kevin Chyn
a24e9fd9ac Add BiometricPromptService
The change introduces the following:
  - BiometricPrompt communicatates with BiometricPromptService (new)
    system service. The service does the decision making for which
    biometric modality to use.
  - As a result, a lot of logic is moved from <Biometric>Manager
    to BiometricPrompt. FingerprintManager now does not care about
    BiometricPrompt logic anymore (reverts several P changes).

Face, and all future <Biometric>Service interfaces must be protected by
the signature-only MANAGE_BIOMETRIC permission. Settings, SystemUI, and
BiometricPromptService are their only clients.

Bug: 72825012

Test: BiometricPromptDemo works
Test: Keyguard works
Test: Settings works

Change-Id: I2b7d6eff81bc07950202c50e592d733032523bf0
2018-08-30 14:49:32 -07:00
Sundong Ahn
63a6a00f44 Build android.test.* with java_sdk_library
android.test.* are built with java_sdk_library and api files are added
by running "make update-api".

android.test.base_static is created for allowing to use
android.test.base as a static library.

Bug:77577799
Test: make -j
Test: make checkapi
Test: make checkapi fails with a random change in the txt file
Test: adb shell cmd package list libraries |\
      grep android.test.*
      And check the android.test.* libraries

Merged-In: Ia27612657532e50b077a9c55dbef59ee3ec04b8a
Change-Id: Ia27612657532e50b077a9c55dbef59ee3ec04b8a
(cherry picked from commit f24779c8c7)
2018-08-29 16:22:00 +09:00
Dongwon Kang
dfea0aab67 MediaPlayer2: use protobuf instead of parcel in invoke()
Also fix MEDIA_INFO handling code to send the event to the client
after handling internal update. (This fixes several cts test cases.)

Test: pass MediaPlayer2Test
Bug: 63934228
Change-Id: I5d4884353057a195b1f587694bfbf66cdf1fd23c
2018-08-28 20:50:08 -07:00
Sundong Ahn
e933cedf83 Build android.test.* with java_sdk_library
android.test.* are built with java_sdk_library and api files are added
by running "make update-api".

android.test.base_static is created for allowing to use
android.test.base as a static library.

Bug:77577799
Test: make -j
Test: make checkapi
Test: make checkapi fails with a random change in the txt file
Test: adb shell cmd package list libraries |\
      grep android.test.*
      And check the android.test.* libraries

Merged-In: Ia27612657532e50b077a9c55dbef59ee3ec04b8a
Change-Id: Ia27612657532e50b077a9c55dbef59ee3ec04b8a
2018-08-29 12:22:59 +09:00
Nan Zhang
a17beeb779 [java9] Convert hiddenapi-list target to Metalava
This blocks how we try java9 for droiddoc since "hiddenapi-lists-docs"
targets depends on libcore sources. So migrate this target to Metalava.

Test: m -j hiddenapi-lists-docs
Bug: b/78245848
Change-Id: Iae47d351d974e33490c3a1e9bb9f0f5d15eedfaf
Merged-In: Iae47d351d974e33490c3a1e9bb9f0f5d15eedfaf
2018-08-23 15:35:33 -07:00
Nan Zhang
d25ad462bc [java9] Convert hiddenapi-list target to Metalava
This blocks how we try java9 for droiddoc since "hiddenapi-lists-docs"
targets depends on libcore sources. So migrate this target to Metalava.

Test: m -j hiddenapi-lists-docs
Bug: b/78245848
Change-Id: Iae47d351d974e33490c3a1e9bb9f0f5d15eedfaf
2018-08-23 15:27:14 -07:00
Nan Zhang
5c31884fdb Merge "Add compatibility check for (system|test_)api-stubs-docs" am: c9b01b87b1 am: 27892305d6
am: 7d11372923

Change-Id: I613d0f35687005f4e2ef1ff26c5d673b44cd5a8a
2018-08-23 02:58:43 -07:00
Treehugger Robot
c9b01b87b1 Merge "Add compatibility check for (system|test_)api-stubs-docs" 2018-08-23 07:33:31 +00:00
Jack Yu
69c8dbb9eb Merge "Added qualified networks services" am: 63de9eabec am: f02b6d6679
am: 507bdec1ab

Change-Id: If60c3165dab5316c17cfe7ba0e5e7d8dab782636
2018-08-22 15:44:55 -07:00
Jack Yu
63de9eabec Merge "Added qualified networks services" 2018-08-22 20:18:11 +00:00
Jack Yu
a3ab5750a4 Added qualified networks services
Added the qualified networks service, which is a base
class for vendor's qualified network service to extend.
The service is to update frameworks the available
networks for data setup for each APN type.

Test: Manual
Bug: 73659459
Change-Id: I7238aeac8e48be2a17245de77239b242703bcb7e
2018-08-21 17:57:57 -07:00
Nan Zhang
cd060d9808 Add compatibility check for (system|test_)api-stubs-docs
Test: m -j api-stubs-docs
Bug: b/78245848
Change-Id: Ia4a337ac464232ac8a5bd054b940a7d7f1f4e213
2018-08-21 10:39:42 -07:00
Pete Gillin
a8ba4c1a5a Merge "Stop reading the generated ojluni sources in droiddoc." am: 8ab61fb0dd am: 493a6bddf1
am: 1d44a65df9

Change-Id: I00155038e50cbe3704f34085f79721d19bdbf534
2018-08-21 09:10:07 -07:00
Pete Gillin
8ab61fb0dd Merge "Stop reading the generated ojluni sources in droiddoc." 2018-08-21 15:14:55 +00:00