Commit Graph

1736 Commits

Author SHA1 Message Date
Andrew Solovay
76044cddc5 Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev am: 04d43a6a7b
am: 51f65bbcbf

Change-Id: I17386cc10e591e60442eeeba7e4dec42c9b4bd54
2017-07-28 21:50:15 +00:00
Andrew Solovay
51f65bbcbf Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev
am: 04d43a6a7b

Change-Id: I57763d6980b66ef288788153d275cf196fbd510a
2017-07-28 20:18:29 +00:00
Dirk Dougherty
fdad0ba193 Cherry-pick from master Doc change: Add API 26 to @since list
Add API 26 to @since list and turn off preview watermarking.
Fix has been successfully submitted in master and affects doc files
only.

Bug: 62087404
Bug: 64123587
Test: make ds-docs

Original change-Id: Idcf84882a1a1fe0864ee6ff3d0af6cd857c73a06

Change-Id: I28700ad15d931256d9dfc1016df546bd2f0e718f
2017-07-27 15:00:46 -07:00
Andrii Kulian
d313469e28 DO NOT MERGE VirtualDisplay wrapper with input forwarding
New version of ActivityView that doesn't use expensive
ActivityContainer, but utilizes VirtualDisplays instead.

Creation of this view is only allowed for callers who have
android.Manifest.permission.INJECT_EVENTS permission.

Launching activities into this container is restricted by
the same rules that apply to launching on VirtualDisplays:
- Owner is allowed to launch its own activities.
- If activity that's being launched is not from the same
  app, then it must be embeddable and launcher must have
  permission to embed.

Bug: 63338670
Test: go/wm-smoke
Change-Id: Id9a25752367ebe8e59d2fc21c5d9de5cf597ea01
2017-07-21 13:14:37 -07:00
Andrii Kulian
94e82d9b0e DO NOT MERGE ActivityView be gone!
This hidden functionality is no longer support/needed since
we now have multi-window/display. A new view group class
will be added later that uses multi-window to support remaining
functionality of this class.

Test: go/wm-smoke
Change-Id: Ie2fa2de92841d33199da9988741905060dd1ddf4
2017-07-21 13:14:19 -07:00
Love Khanna
1e43a74a47 Merge "NFC DTA Integration" into oc-dr1-dev
am: f8469ccf17

Change-Id: I8acca990e6191360fc3f4f9c668f74d7a06d6a52
2017-07-21 05:08:25 +00:00
Love Khanna
755a8fa44e NFC DTA Integration
Bug: 63903843
Test: compiles.
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
2017-07-20 22:15:39 +00:00
Robert Greenwalt
bfa50d4852 Merge "Add details to Download progress callback" am: b440b572d7 am: 5f047a68d9 am: 12286b2608
am: 7acfec846b

Change-Id: If16b8c107d39c5791ea8c3b3b28afd4f37500b44
2017-07-20 00:49:58 +00:00
Robert Greenwalt
7acfec846b Merge "Add details to Download progress callback" am: b440b572d7 am: 5f047a68d9
am: 12286b2608

Change-Id: Iff3707dab4ee737e5de2b1b8bded811f919553a8
2017-07-20 00:42:21 +00:00
Robert Greenwalt
5f047a68d9 Merge "Add details to Download progress callback"
am: b440b572d7

Change-Id: Idb7ebf8ec5d0b6b341c97dab05efc94e9e629011
2017-07-20 00:30:50 +00:00
Robert Greenwalt
0ebff46583 Add details to Download progress callback
Split decode into max size and current size.

Test: builds
Change-Id: Ice18d7f0e9ae99b3c24fe10843da80abd0d912d7
2017-07-19 15:02:29 -07:00
Lorenzo Colitti
8228eb3446 resolve merge conflicts of a1d67fb38e to stage-aosp-master
Test: make -j64 services
Change-Id: I3955b01189993f3051c608bc5d07a87e4e3b5f0b
Merged-In: Ic1e799c17b4bb0272cf85e03d5ad14981a55defa
2017-07-19 07:35:31 +09:00
Lorenzo Colitti
07f1304cfe Allow more than one source of tethering statistics.
Currently, netd is the only source of tethering statistics.
In order to support multiple sources, define a new
ITetheringStatsProvider interface that can be registered with
NetworkManagmentService. Convert the existing code into the
first ITetheringStatsProvider.

(cherry picked from commit ef7b2a13ce)

Bug: 29337859
Bug: 32163131
Test: builds, boots
Test: tethering stats continue to be collected
Change-Id: Ie1b5a5e47ae4bf5af922365b09fa241e834236e4
Merged-In: Ie1b5a5e47ae4bf5af922365b09fa241e834236e4
2017-07-19 00:54:54 +09:00
Tomasz Wasilczyk
38d9ee4cd6 Merge "Implement ProgramSelector for font-end Java APIs." 2017-07-18 15:36:22 +00:00
Tomasz Wasilczyk
8cfb0e81fd Implement ProgramSelector for font-end Java APIs.
Bug: b/32621193
Test: instrumentalization
Change-Id: Ibb9841fed76ef3568c2e36ca28ea31addf9175f1
2017-07-17 16:23:05 -07:00
Lorenzo Colitti
f7a008ff69 Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev am: 3756636ad6
am: 041111ff7e

Change-Id: I538f7faef85bbb13499dec2125e0f82b3175396f
2017-07-14 01:06:56 +00:00
Lorenzo Colitti
041111ff7e Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev
am: 3756636ad6

Change-Id: Ic1e799c17b4bb0272cf85e03d5ad14981a55defa
2017-07-14 01:01:29 +00:00
Lorenzo Colitti
ef7b2a13ce Allow more than one source of tethering statistics.
Currently, netd is the only source of tethering statistics.
In order to support multiple sources, define a new
ITetheringStatsProvider interface that can be registered with
NetworkManagmentService. Convert the existing code into the
first ITetheringStatsProvider.

Bug: 29337859
Bug: 32163131
Test: builds, boots
Test: tethering stats continue to be collected
Change-Id: Ie1b5a5e47ae4bf5af922365b09fa241e834236e4
2017-07-13 23:34:25 +09:00
Hall Liu
19b49f6c3c Merge "Implement getDownloadStatus and add permission" am: 2fa880d016 am: d45a007222 am: 9888af1dfc
am: 81d9c6fe71

Change-Id: Ida7f8cfd440553658108688b84f866dddafa3166
2017-07-12 23:57:21 +00:00
Hall Liu
81d9c6fe71 Merge "Implement getDownloadStatus and add permission" am: 2fa880d016 am: d45a007222
am: 9888af1dfc

Change-Id: I98d30f379072302a5e76a8b157d8aecdd1616235
2017-07-12 23:44:51 +00:00
Hall Liu
d45a007222 Merge "Implement getDownloadStatus and add permission"
am: 2fa880d016

Change-Id: I1c8b9140d6fdc20347858f1296dbccfc60319959
2017-07-12 23:27:49 +00:00
Hall Liu
55f557dc7c Implement getDownloadStatus and add permission
- Implement getDownloadStatus in the manager
- Remove DownloadStatus and add constants in its place to reflect the
status of a single file
- Add ACT_AS_EMBMS_MIDDLEWARE permission

Change-Id: Ica8b8a872a8088a2aaf56d40926051225aa39e87
2017-07-06 13:40:09 -07:00
Paul Duffin
db8ef65206 Merge "Refactor in preparation for removing android.test.mock" 2017-06-30 07:46:55 +00:00
John Reck
4dbcd23b5a Merge "Add SharedMemory API" 2017-06-29 17:35:17 +00:00
Paul Duffin
c08090f6d2 Refactor in preparation for removing android.test.mock
The goal of this change is two fold:
1) Allow the test-runner/src classes to continue to be included in the
   JavaDoc even when they are removed from the Android API.

2) Make it easy to remove android.test.mock classes from the API.

This was done in two stages:
1) Push the reference to test-runner/src from fwbase_dirs_to_document
   down to dirs_to_document and
   framework_docs_LOCAL_API_CHECK_SRC_FILES.

2) Expand the reference in framework_docs_LOCAL_API_CHECK_SRC_FILES into
   two new variables that reference the classes from test-runner/src.
   One references those that are required for android.test.mock and the
   other references the remaining ones.

Bug: 30188076
Test: make checkbuild
Change-Id: I558164e6c9ea2a24bd58e5f4f54dd4c3b2a11924
2017-06-29 15:57:42 +01:00
John Reck
dea6a02761 Add SharedMemory API
SharedMemory is parcelable and AIDL friendly
and exposes cool things like dropping write permissions
that are useful for shared memory to have.

Also exposes getFileDescriptor() on MemoryFile
since that was necessary to use MemoryFile
with IPC previously and there are a sizeable
number of reflections that access it, so just make
it public.

Test: SharedMemory CTS tests pass

Change-Id: I71a322abf2eb55267d7299a8e41f847339af8b08
2017-06-28 16:49:12 -07:00
TreeHugger Robot
b6d9ba31de Merge "cas: convert MediaCas to HIDL" 2017-06-28 20:37:24 +00:00
Jeff Davidson
ad60b37575 Merge "Add EuiccManager#retainSubscriptionsOnFactoryReset API." into oc-dr1-dev am: f28843dd3f
am: 53ad2499f1

Change-Id: I538f0405811b0df28960acdb6f275689f19185dc
2017-06-28 17:41:26 +00:00
Jeff Davidson
7b69a86b02 Add EuiccManager#retainSubscriptionsOnFactoryReset API.
By default, all subscriptions are wiped on first boot after a factory
reset. This ensures that if data is wiped outside of userspace (e.g.
in fastboot/recovery), the profiles are wiped, as there's no way to
offer this option to users in those modes - the radio isn't available
for us to access the eUICC.

This API provides a way to bypass this wipe if the user opts to retain
the policies for a wipe done from userspace (e.g. by unchecking the
"Wipe eUICC" checkbox in platform settings before wiping). We tell the
LPA to note this and skip the wipe on the ensuing factory reset.

Change-Id: I2fe472417497e28b043841a5aa2dc9efa45ebbff
Test: TreeHugger
Fixes: 62681577
2017-06-27 09:23:07 -07:00
Chong Zhang
2659c2f16c cas: convert MediaCas to HIDL
- Replace AIDL interfaces with corresponding HIDL ones.

bug: 22804304
Change-Id: I8c552ce6fc3766715cd1bc0ea05c0988d56f590e
2017-06-23 16:18:55 -07:00
Jeff Davidson
efd7a8c0c0 Merge "eUICC API error code cleanup." into oc-dr1-dev am: 93a59696ad
am: 7074cb84f0

Change-Id: I71f401ce03c51a6c5b52ececda183f8a32433c9c
2017-06-15 03:49:31 +00:00
Jeff Davidson
93a59696ad Merge "eUICC API error code cleanup." into oc-dr1-dev 2017-06-15 03:35:12 +00:00
Lucas Dupin
1ead7fc753 Scrims should be grey when in-app
Bug: 38164389
Test: runtest -x colorextraction/tests/src/com/google/android/colorextraction/ColorExtractorTest.java
Test: runtest -x tests/src/com/android/systemui/colorextraction/SysuiColorExtractorTests.java
Change-Id: Ifcc04a8562e46b4f65bce0470ccd6c02dffcf377
(cherry picked from commit e1571705e6)
2017-06-14 10:00:16 -07:00
Alan Viverette
6cd0457548 Merge "Federate platform docs against support library API file" 2017-06-13 20:33:23 +00:00
Jeff Davidson
83f8bc81be eUICC API error code cleanup.
-Remove result classes in cases that a simple int will do. Split the
int error code space (now shared across all calls) into two parts -
predefined errors (0 or negative) and custom errors (positive).

-Replace "generic error" with "error" in naming.

-Remove detailed code from any result returned by the LPA. There is
still a detailed code in the platform API, which is equal to the
result code returned by the LPA.

Fixes: 38206601
Test: TreeHugger
Change-Id: I304081db2127a22d6dd67b6494b4f3279614d19c
2017-06-13 17:51:07 +00:00
Tomasz Wasilczyk
9045e5d226 Merge "Implement remaining ITunerCallback methods." 2017-06-13 15:42:24 +00:00
Alan Viverette
9ca513e042 Federate platform docs against support library API file
Bug: 36959367
Test: make docs
Change-Id: I7c6dffed25566c2bb1183aba60103c437888ba21
2017-06-12 11:32:07 -04:00
Lucas Dupin
e1571705e6 Scrims should be grey when in-app
Bug: 38164389
Test: runtest -x colorextraction/tests/src/com/google/android/colorextraction/ColorExtractorTest.java
Test: runtest -x tests/src/com/android/systemui/colorextraction/SysuiColorExtractorTests.java
Change-Id: Ifcc04a8562e46b4f65bce0470ccd6c02dffcf377
2017-06-11 20:05:11 -07:00
Tomasz Wasilczyk
c9a1ac7819 Implement remaining ITunerCallback methods.
Test: instrumentation tests passes, none added
Bug: b/36863239
Change-Id: I57de30992f679624c8fde0657c0e24b5cbfab905
2017-06-09 13:09:39 -07:00
Jordan Liu
b699e98285 Merge "Add IApnSourceService.aidl" am: 1d5d409f6f
am: 7b78a176a9

Change-Id: I8fd54598aae183364ba44a0d5ca2f4331436292a
2017-06-09 19:04:48 +00:00
Jordan Liu
6d783e3529 Add IApnSourceService.aidl
This service is bound to by TelephonyProvider on devices where we don't
use the apns-conf.xml file.

Bug: 37283190
Test: manual
Change-Id: I16da1c5acc5ba1fe0237cc0d37c73d831c2d1508
Merged-In: I16da1c5acc5ba1fe0237cc0d37c73d831c2d1508
2017-06-09 10:41:37 -07:00
Jordan Liu
e5c7420f45 Add IApnSourceService.aidl
This service is bound to by TelephonyProvider on devices where we don't
use the apns-conf.xml file.

Bug: 37283190
Test: manual
Change-Id: I16da1c5acc5ba1fe0237cc0d37c73d831c2d1508
Merged-In: I16da1c5acc5ba1fe0237cc0d37c73d831c2d1508
2017-06-08 15:56:38 -07:00
Jordan Liu
a1bb6957f5 Merge "Add IApnSourceService.aidl" 2017-06-08 21:40:21 +00:00
Etan Cohen
486a411224 [AWARE] Add validity check on PMK/Passphrase lengths
Bug: 62376042
Test: unit tests + inegrated (sl4a) tests
Change-Id: Ib6383a0ba9ef61114eb72b9a04cc683792b8e89d
2017-06-07 12:08:09 -07:00
Jordan Liu
e1ef510f4e Add IApnSourceService.aidl
This service is bound to by TelephonyProvider on devices where we don't
use the apns-conf.xml file.

Bug: 37283190
Test: manual
Change-Id: I16da1c5acc5ba1fe0237cc0d37c73d831c2d1508
2017-06-06 14:38:25 -07:00
TreeHugger Robot
ae6455957b Merge "Initial support for proposed android.net.lowpan" 2017-06-06 20:25:54 +00:00
Jeff Sharkey
28f6dc9512 Merge "Give Doclava our manifest; more permission docs." into oc-dev am: 65d4cbba37
am: 67cb5f5210

Change-Id: Ic4c30cdb8bbfda5b3703eb3c7c36c1bf8ab3a216
2017-06-06 16:17:39 +00:00
Jeff Sharkey
67cb5f5210 Merge "Give Doclava our manifest; more permission docs." into oc-dev
am: 65d4cbba37

Change-Id: I2ec50efb67debd15d354db69b84fb620eb74bc0e
2017-06-06 15:28:26 +00:00
Jeff Sharkey
bfc4fcde9f Give Doclava our manifest; more permission docs.
We've seen some @SystemApi methods protected with non-system
permissions, so give Doclava the platform AndroidManifest.xml so it
can parse the actual permission protection levels to look for APIs
that are letting in non-system apps.

Also document more @SystemApi permissions.

This is purely a docs change; no logic changes are being made.

Test: make -j32 update-api
Bug: 62263906
Change-Id: Ie0f0a5fb0033817bcc95060f2183a52ae4ae7b06
2017-06-05 17:38:19 -06:00
Keun-young Park
067cf3e883 add skeleton CarServiceHelperService
- CarServiceHelperService is a companion service for car service which
  is used only for car product.
- HelperService starts car service and provide necessary interface
  for system server internal behavior control.

bug: 62342376
Test: test boot-up
Change-Id: I1728437434eab36bd2df6ba0a534731823bbcf35
2017-06-05 14:27:25 -07:00