OSDN Git Service
Bill Yi [Thu, 21 Dec 2017 19:25:25 +0000 (19:25 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
599fb37c01 -s ours am:
d21211470c -s ours am:
f1c75d66ec -s ours
am:
b7a560fb10 -s ours
Change-Id: I612fa092984c77c735a27c0da5998890c518ffd4
Bill Yi [Thu, 21 Dec 2017 19:22:55 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e1ca34b5c7 -s ours am:
d5a7faea83 -s ours am:
bd14c44fd8 -s ours
am:
f6c335b353 -s ours
Change-Id: I7b218e76069fce17d24c3bc12fa28af797ee69d4
Bill Yi [Thu, 21 Dec 2017 19:20:42 +0000 (19:20 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ce772e941 -s ours am:
51fc07ad61 -s ours am:
c344f9b1c7 -s ours
am:
39d480e67c -s ours
Change-Id: I521cbe71ba8abbaa04deb8e4ae232764687a29d2
Bill Yi [Thu, 21 Dec 2017 19:19:10 +0000 (19:19 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1f204cd1ea -s ours am:
5943ef281a -s ours am:
2c97ca3b62 -s ours
am:
934729c535 -s ours
Change-Id: Id05ac1fc16e2e054febc631943424b85008d34b2
Bill Yi [Thu, 21 Dec 2017 19:17:16 +0000 (19:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
970261b46c -s ours am:
a683975c54 -s ours am:
0bfcd7eef7 -s ours
am:
f123f221db -s ours
Change-Id: Iaa7ea701db9f070098ae53d98b8e019a865bb704
Bill Yi [Thu, 21 Dec 2017 19:15:41 +0000 (19:15 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9593ca1955 -s ours am:
7244723549 -s ours am:
05e41d0531 -s ours
am:
7baaa51e62 -s ours
Change-Id: I6ae9f1fbaa5335f0906dc4af678226dd101c8cd2
Bill Yi [Thu, 21 Dec 2017 19:13:50 +0000 (19:13 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0c1f4c2931 -s ours am:
2d00ab621a -s ours am:
e135a35edf -s ours
am:
301dfae698 -s ours
Change-Id: I47dc0cc519fd0707c83e3aab976934b3b3ce2150
Bill Yi [Thu, 21 Dec 2017 19:12:14 +0000 (19:12 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
496af8623f -s ours am:
c81e5ae281 -s ours am:
13062c93e5 -s ours
am:
25d7b576ec -s ours
Change-Id: Iaf6c344263bc6d3e32f0df8d14cc27327a30b3ec
Bill Yi [Thu, 21 Dec 2017 17:57:33 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
599fb37c01 -s ours am:
d21211470c -s ours
am:
f1c75d66ec -s ours
Change-Id: Iaae57c91c09a4b1780c0c8e474700c56133b264e
Bill Yi [Thu, 21 Dec 2017 17:55:45 +0000 (17:55 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e1ca34b5c7 -s ours am:
d5a7faea83 -s ours
am:
bd14c44fd8 -s ours
Change-Id: I0560d15c8c2df65b61818ccbb12f5057d1a0c5c8
Bill Yi [Thu, 21 Dec 2017 17:52:15 +0000 (17:52 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ce772e941 -s ours am:
51fc07ad61 -s ours
am:
c344f9b1c7 -s ours
Change-Id: I0f33f5e6ba5168e27ed60cb36b762708b641d34a
Bill Yi [Thu, 21 Dec 2017 17:51:21 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
599fb37c01 -s ours
am:
d21211470c -s ours
Change-Id: Ife7d7f70c599c556abebf10eee525072a127b34d
Bill Yi [Thu, 21 Dec 2017 17:50:54 +0000 (17:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1f204cd1ea -s ours am:
5943ef281a -s ours
am:
2c97ca3b62 -s ours
Change-Id: Ia71bb418e6bf22e2347436d883e1bcd1c9937d61
Bill Yi [Thu, 21 Dec 2017 17:50:03 +0000 (17:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e1ca34b5c7 -s ours
am:
d5a7faea83 -s ours
Change-Id: Ie8542f341e8be8ea5d28f300773c0d49c6a16aab
Bill Yi [Thu, 21 Dec 2017 17:48:29 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ce772e941 -s ours
am:
51fc07ad61 -s ours
Change-Id: I336996e228fd3c69f192d3614207f24cec0b4ed8
Bill Yi [Thu, 21 Dec 2017 17:44:40 +0000 (17:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
599fb37c01 -s ours
Change-Id: Icc605bca96905c647601df651186850c874b5442
Bill Yi [Thu, 21 Dec 2017 17:44:38 +0000 (17:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
970261b46c -s ours am:
a683975c54 -s ours
am:
0bfcd7eef7 -s ours
Change-Id: I30395fbf54d028c4f2e8bd21aa362e9d8e993195
Bill Yi [Thu, 21 Dec 2017 17:42:25 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
e1ca34b5c7 -s ours
Change-Id: Ie97a72b89d17e982dbe499c26c956dafffe5effa
Bill Yi [Thu, 21 Dec 2017 17:42:12 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1f204cd1ea -s ours
am:
5943ef281a -s ours
Change-Id: I9758d713fb9328b7f2218dae49e334f16a703476
Bill Yi [Thu, 21 Dec 2017 17:42:08 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9593ca1955 -s ours am:
7244723549 -s ours
am:
05e41d0531 -s ours
Change-Id: I730f5dcee5ea85c408f7cf21dafab011e869d66d
Bill Yi [Thu, 21 Dec 2017 17:41:01 +0000 (17:41 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
7ce772e941 -s ours
Change-Id: I0a8e327692fb18d67b9e724ce3254f3c342206b9
Bill Yi [Thu, 21 Dec 2017 17:37:26 +0000 (17:37 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
970261b46c -s ours
am:
a683975c54 -s ours
Change-Id: I54b9b28c9ad38ad19c1e7f228e2e095dfd5cabe3
Bill Yi [Thu, 21 Dec 2017 17:35:51 +0000 (17:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0c1f4c2931 -s ours am:
2d00ab621a -s ours
am:
e135a35edf -s ours
Change-Id: Ib75ec7b79501a31cab373f919c06a791a7ad9a4a
TreeHugger Robot [Wed, 20 Dec 2017 23:44:55 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 23:44:18 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 23:44:11 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Andrew Solovay [Wed, 20 Dec 2017 21:34:26 +0000 (21:34 +0000)]
Merge "doc: Fixing Javadoc formatting problems." into oc-mr1-dev
Bill Yi [Wed, 20 Dec 2017 19:29:47 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
1f204cd1ea -s ours
Change-Id: I0f8053bf3d65cd451e704ad682cd54b29953e944
Bill Yi [Wed, 20 Dec 2017 19:26:37 +0000 (19:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9593ca1955 -s ours
am:
7244723549 -s ours
Change-Id: Id717ceb76ced6f3fb2b10689efd916e7e7cc5cfe
Bill Yi [Wed, 20 Dec 2017 19:25:28 +0000 (19:25 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
496af8623f -s ours am:
c81e5ae281 -s ours
am:
13062c93e5 -s ours
Change-Id: I524e2276bb358a4373036c7943b1b00f53ebaa17
Bill Yi [Wed, 20 Dec 2017 19:22:02 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
970261b46c -s ours
Change-Id: I1f37c148c9d2086d198443c596880fbc57cbad4b
Bill Yi [Wed, 20 Dec 2017 19:19:15 +0000 (19:19 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0c1f4c2931 -s ours
am:
2d00ab621a -s ours
Change-Id: Ib3d980494cfeb7ddc621e1185429635cc5b3ab8d
Bill Yi [Wed, 20 Dec 2017 19:17:58 +0000 (19:17 +0000)]
Import translations. DO NOT MERGE am:
406659b709 -s ours am:
1fccf167ff -s ours am:
daa1d87e50 -s ours
am:
0e62ea2f4c -s ours
Change-Id: Ia89c48363a381a246f132a2d8619d7b650ed19ab
Bill Yi [Wed, 20 Dec 2017 19:17:58 +0000 (19:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
9593ca1955 -s ours
Change-Id: Ie8c5ea32885dc3c6ee7b688beaf13f179dc95475
Bill Yi [Wed, 20 Dec 2017 19:16:46 +0000 (19:16 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
496af8623f -s ours
am:
c81e5ae281 -s ours
Change-Id: I90e825b5d0b540318f8a75f10bac95323e110cfa
Bill Yi [Wed, 20 Dec 2017 19:12:46 +0000 (19:12 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
0c1f4c2931 -s ours
Change-Id: Ib2fcf638c1433c444796d90fa8578c035c60b3df
Bill Yi [Wed, 20 Dec 2017 19:12:00 +0000 (19:12 +0000)]
Import translations. DO NOT MERGE am:
406659b709 -s ours am:
1fccf167ff -s ours
am:
daa1d87e50 -s ours
Change-Id: Ieeaf1281b3ef3256264850f8910c7075e07eabe6
Bill Yi [Wed, 20 Dec 2017 19:10:42 +0000 (19:10 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
496af8623f -s ours
Change-Id: I3acd580690e2bca34b21d600225f53ac7b467185
Bill Yi [Wed, 20 Dec 2017 19:07:26 +0000 (19:07 +0000)]
Import translations. DO NOT MERGE am:
406659b709 -s ours
am:
1fccf167ff -s ours
Change-Id: I295d71779c2361915f61c3b1f76ca90103b716ea
TreeHugger Robot [Wed, 20 Dec 2017 19:07:04 +0000 (19:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 19:05:04 +0000 (19:05 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 19:04:41 +0000 (19:04 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 20 Dec 2017 19:03:39 +0000 (19:03 +0000)]
Import translations. DO NOT MERGE
am:
406659b709 -s ours
Change-Id: Ida0956b8a3ba81a7a5f78753236c0cac001c2b1a
TreeHugger Robot [Wed, 20 Dec 2017 18:59:40 +0000 (18:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 18:59:10 +0000 (18:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Andrew Solovay [Tue, 19 Dec 2017 01:23:35 +0000 (17:23 -0800)]
doc: Fixing Javadoc formatting problems.
No code changes, just fixing typos in the doc comments.
Doc is staged to:
http://go/dac-stage/reference/android/service/autofill/AutofillService.html
http://go/dac-stage/reference/android/service/autofill/FillRequest.html
Test: make ds-docs
Bug:
70812346
Merged-In: Ia76121c60197275c6be1717c8003fe1c4baf5f97
Change-Id: I5ee04bb96234441c5740665540b5e803fcf9710f
Bill Yi [Wed, 20 Dec 2017 13:29:48 +0000 (05:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie04afa32da40ba59ba9e9c9964fee8b597f00d1e
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 13:24:54 +0000 (05:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: If89c7f1e2e96a2922b4cce9c446109b8d085b091
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 12:39:09 +0000 (04:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6891787af9011c1559364b4966808a907949b07e
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 12:29:19 +0000 (04:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia614e1fe986931cbc5bb2dee16c9fb5c69e6c4b7
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 12:10:52 +0000 (04:10 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifd1b4a854360927ae4479ca8d1bf0637c98aa5e5
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 11:56:50 +0000 (03:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4246a775e430d1db88a7c64144a4dca6824be297
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 11:43:02 +0000 (03:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7c5bfc2833a1fa01d3f1cabd451fa88ce8535094
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 11:38:01 +0000 (03:38 -0800)]
Import translations. DO NOT MERGE
Change-Id: I200b939582ec1b2a016f83f62ebb586da842bfae
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Dec 2017 11:32:57 +0000 (03:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: I63d54555e4cb7071f114b81d17b1364475a4380f
Auto-generated-cl: translation import
Kevin Hufnagle [Mon, 18 Dec 2017 17:57:39 +0000 (09:57 -0800)]
docs: Touch-up edits to ShortcutManager class reference.
Test: make ds-docs -j16
Bug:
64727234
Change-Id: Ieb2c2f6ee6706f206e2cc0d5be8bc3a5cdd9f345
Kevin Hufnagle [Mon, 18 Dec 2017 17:42:48 +0000 (17:42 +0000)]
Merge "docs: Revised wording, section order for ShortcutManager API ref." into oc-mr1-dev
Kevin Hufnagle [Sat, 2 Dec 2017 00:01:36 +0000 (16:01 -0800)]
docs: Revised wording, section order for ShortcutManager API ref.
Provided more thorough description of static shortcut options,
integrated shortcut limits section with the "updating shortcuts"
example, added more links to narrative documentation.
Test: make ds-docs -j8
Bug:
64727234
Change-Id: I70c16082e3e85a31b501c8e313d93200d827c7f4
Ricardo Loo Foronda [Fri, 27 Oct 2017 00:02:31 +0000 (17:02 -0700)]
docs: Added code tag to meta-data name and fixed some @see tags
Status: Ready for review.
Changes:
* Surrounded android.service.carrier.LONG_LIVED_BINDING with code tags
in CarrierService class.
* Prefixed @see tags with # in CarrierConfigManager#KEY_FORCE_HOME_NETWORK_BOOL.
* Prefixed @see tag with class name in
CarrierConfigManager#notifyConfigChangedForSubId.
Test: make ds-docs
Staged content:
*
https://android-dot-devsite.googleplex.com/reference/android/service/carrier/CarrierService.html
*
https://android-dot-devsite.googleplex.com/reference/android/telephony/CarrierConfigManager.html#KEY_FORCE_HOME_NETWORK_BOOL
*
https://android-dot-devsite.googleplex.com/reference/android/telephony/CarrierConfigManager.html#notifyConfigChangedForSubId(int)
Bug:
23289716
Change-Id: I3b5be3ecc45bfb83e3fe0ae9bc76dc7761557e08
Felipe Leme [Thu, 14 Dec 2017 02:00:35 +0000 (02:00 +0000)]
Proper autofill fix to let phone process autofill Settings activity. am:
2f58b03ea1
am:
4a8d9b628f -s ours
Change-Id: Idecee1722d2f0cb504fb591caa0dc1609361e392
Felipe Leme [Thu, 14 Dec 2017 01:49:36 +0000 (01:49 +0000)]
Proper autofill fix to let phone process autofill Settings activity.
am:
2f58b03ea1
Change-Id: Ia167badcdb5fee60a62c9cf0932150b54180ba0b
TreeHugger Robot [Thu, 14 Dec 2017 01:15:51 +0000 (01:15 +0000)]
Merge "Proper autofill fix to let phone process autofill Settings activity." into oc-mr1-dev
TreeHugger Robot [Tue, 12 Dec 2017 21:48:11 +0000 (21:48 +0000)]
Merge "OMS: Only allow trusted overlays to be registered." into oc-mr1-dev
Felipe Leme [Mon, 11 Dec 2017 22:37:35 +0000 (14:37 -0800)]
Proper autofill fix to let phone process autofill Settings activity.
Test: adb shell am start com.android.settings/.RadioInfo
Bug:
69981710
Fixes:
70506888
Change-Id: Id29bad2d20b621f7379eb6144c95dcc819949b3d
Merged-In: Id29bad2d20b621f7379eb6144c95dcc819949b3d
(cherry picked from commit
97f16a76db29269619d9a1b45d4cea49026a5b6a)
Felipe Leme [Mon, 11 Dec 2017 22:37:35 +0000 (14:37 -0800)]
Proper autofill fix to let phone process autofill Settings activity.
Test: adb shell am start com.android.settings/.RadioInfo
Bug:
69981710
Fixes:
70506888
Change-Id: Id29bad2d20b621f7379eb6144c95dcc819949b3d
Merged-In: Id29bad2d20b621f7379eb6144c95dcc819949b3d
Felipe Leme [Fri, 8 Dec 2017 18:53:17 +0000 (18:53 +0000)]
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev am:
bd355dbf58
am:
d62d68785e -s ours
Change-Id: I7f5471c6329e54669c2926779a26536a9dc6e51d
Felipe Leme [Fri, 8 Dec 2017 18:39:01 +0000 (18:39 +0000)]
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev
am:
bd355dbf58
Change-Id: I922cbe5c9b1e71569e09241564faf537fb923604
TreeHugger Robot [Fri, 8 Dec 2017 18:16:24 +0000 (18:16 +0000)]
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev
TreeHugger Robot [Fri, 8 Dec 2017 18:05:59 +0000 (18:05 +0000)]
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-mr1-dev
TreeHugger Robot [Fri, 8 Dec 2017 05:02:31 +0000 (05:02 +0000)]
Merge "Add assisted dialing properties to the framework." into oc-mr1-dev
TreeHugger Robot [Thu, 7 Dec 2017 23:07:40 +0000 (23:07 +0000)]
Merge "DO NOT MERGE - Backported some Autofill Javadoc improvements from " into oc-mr1-dev
Adam Lesinski [Tue, 14 Nov 2017 08:50:18 +0000 (00:50 -0800)]
OMS: Only allow trusted overlays to be registered.
Bug:
69383160
Test: cts-tradefed run cts -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.OverlayHostTest
Change-Id: I930c11716317cff1ec485a3943d1f22f07a423df
Merged-In: I930c11716317cff1ec485a3943d1f22f07a423df
Felipe Leme [Thu, 7 Dec 2017 18:46:26 +0000 (10:46 -0800)]
DO NOT MERGE - Backported some Autofill Javadoc improvements from
Test: in Tree Hugger we trust!
Bug:
70215975
Change-Id: If679e735f1fe1916457c16d33d09cb47573ee7dd
Merged-In: I8ab3d76983259830fd90867bd2d7f1e3360b3c4e
Eric Erfanian [Thu, 7 Dec 2017 00:27:53 +0000 (16:27 -0800)]
Add assisted dialing properties to the framework.
These properties allow the feature to be propogated from
the outgoing call broadcast, to the connection, to the call,
and finally to the call log as a feature.
Test: no existing unit tests found. could use some pointers
Bug:
35963245
Merged-In: I84343fb0cda16514c01997fd71d1e819b5b7eebb
Change-Id: I086e761ada9a57dca61c3a412561ee54255d6260
Felipe Leme [Fri, 1 Dec 2017 01:41:57 +0000 (17:41 -0800)]
Make sure apps cannot forge package name on AssistStructure used for Autofill.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.VirtualContainerActivityTest#testAppCannotFakePackageName
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Bug:
69981710
Change-Id: Id6036cddb51dd8dd0c9128b7212d573f630d693f
Merged-In: Id6036cddb51dd8dd0c9128b7212d573f630d693f
Felipe Leme [Fri, 1 Dec 2017 01:41:57 +0000 (17:41 -0800)]
Make sure apps cannot forge package name on AssistStructure used for Autofill.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.VirtualContainerActivityTest#testAppCannotFakePackageName
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Bug:
69981710
Change-Id: Id6036cddb51dd8dd0c9128b7212d573f630d693f
Merged-In: Id6036cddb51dd8dd0c9128b7212d573f630d693f
Kevin Hufnagle [Wed, 6 Dec 2017 22:03:50 +0000 (22:03 +0000)]
Merge "docs: Fixed key generator initialize method call." into oc-mr1-dev
Pankaj Kanwar [Wed, 6 Dec 2017 17:42:20 +0000 (17:42 +0000)]
Merge "[AWARE] Make PeerHandle comparable/hashable" into oc-mr1-dev
Rubin Xu [Mon, 4 Dec 2017 17:07:19 +0000 (17:07 +0000)]
resolve merge conflicts of
2ff6320d773c to oc-dr1-dev
am:
59f44d34c6
Change-Id: I7afc27da73c5a54537fcd8f49128752e00a954ea
Etan Cohen [Mon, 4 Dec 2017 15:53:31 +0000 (07:53 -0800)]
[AWARE] Make PeerHandle comparable/hashable
Add public equals()/hash() methods to PeerHandle. Allows the handle to
be used across multiple calls/sessions.
(partial cherry-pick of commit
3d33d7495ffbf12966299df8359d71a6f0926e7a)
(cherry-pick of commit
0d49c0dda8bfef0267d81e8490e4882e51a15af4)
Bug:
68931709
Test: builds, unit test, integration test
Change-Id: I87df50edb948a7afc90e496165013235ddca1e48
Merged-In: Idc59269d4275181ed6d9a793213c681dc4e98134
Merged-In: I6848acda9bfef306b8feaae6987ff18f7bc2e6ec
Rubin Xu [Mon, 4 Dec 2017 11:32:48 +0000 (11:32 +0000)]
resolve merge conflicts of
2ff6320d773c to oc-dr1-dev
Change-Id: I3711119a6cbba1b697ad379a8520b73023c27edb
TreeHugger Robot [Sat, 2 Dec 2017 00:01:31 +0000 (00:01 +0000)]
Merge "Swap the order of synthetic password wrapping" into oc-dev
TreeHugger Robot [Fri, 1 Dec 2017 23:53:03 +0000 (23:53 +0000)]
Merge "Swap the order of synthetic password wrapping" into oc-mr1-dev
Kevin Hufnagle [Fri, 1 Dec 2017 20:27:49 +0000 (20:27 +0000)]
Merge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT is implicit broadcast as of O." into oc-dev am:
a96e533840
am:
87b5b0aa1a
Change-Id: Iabdbdf3f19e5faa4a0e980afc4d643dad192fc62
Kevin Hufnagle [Fri, 1 Dec 2017 20:20:44 +0000 (20:20 +0000)]
Merge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT is implicit broadcast as of O." into oc-dev
am:
a96e533840
Change-Id: Iefd97a3d8b1377dd72f3a3428c539cb029b4e0a9
Kevin Hufnagle [Fri, 1 Dec 2017 20:06:38 +0000 (20:06 +0000)]
Merge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT is implicit broadcast as of O." into oc-dev
TreeHugger Robot [Fri, 1 Dec 2017 19:30:44 +0000 (19:30 +0000)]
Merge "docs: Fixed description of SENSORS permission group" into oc-mr1-dev
Andrew Solovay [Fri, 1 Dec 2017 19:19:04 +0000 (19:19 +0000)]
Merge "docs: Add note to getFrameAtTime() pointing to getScaledFrameAtTime()" into oc-mr1-dev
Jon Dormody [Fri, 1 Dec 2017 16:28:14 +0000 (16:28 +0000)]
Merge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs Bug:
1766768" into oc-dev am:
ce7f1e6601
am:
3ba37e1f53
Change-Id: Ia807c8ccd0db5b37b010f64a417fc8e105c22866
Jon Dormody [Fri, 1 Dec 2017 16:16:53 +0000 (16:16 +0000)]
Merge "Docs: Added mention that the getSharedPreferences method is thread safe." into oc-dev am:
fb839ce59a
am:
728ca235b5
Change-Id: Ib6d81f2355ef9d902725e2e1ee1cd5337f4294ad
Jon Dormody [Fri, 1 Dec 2017 16:14:15 +0000 (16:14 +0000)]
Merge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs Bug:
1766768" into oc-dev
am:
ce7f1e6601
Change-Id: If7798db1aea1f1d6cdb42a7d25509c814a31f6ca
Jon Dormody [Fri, 1 Dec 2017 16:07:27 +0000 (16:07 +0000)]
Merge "Docs: Added mention that the getSharedPreferences method is thread safe." into oc-dev
am:
fb839ce59a
Change-Id: Ic135f510c6e5ff8a9a00f2d2be1fcc0c284dd5cf
Jon Dormody [Fri, 1 Dec 2017 15:53:36 +0000 (15:53 +0000)]
Merge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs Bug:
1766768" into oc-dev
Jon Dormody [Fri, 1 Dec 2017 15:52:54 +0000 (15:52 +0000)]
Merge "Docs: Added mention that the getSharedPreferences method is thread safe." into oc-dev
Andrew Solovay [Wed, 29 Nov 2017 22:51:40 +0000 (14:51 -0800)]
docs: Add note to getFrameAtTime() pointing to getScaledFrameAtTime()
Added a note to the various getFrame... methods saying that if you
don't need a full-resolution frame, getScaledFrameAtTime() is
preferable. Removed existing text suggesting you use those other
methods for fetching a thumbnail.
Staged revised doc to:
http://go/dac-stage/reference/android/media/MediaMetadataRetriever.html
Bug:
69804003
Test: make ds-docs
Change-Id: I54250b2d127987ef3c1633c011f5eac6b747372e
Jonathan Dormody [Thu, 30 Nov 2017 22:06:55 +0000 (15:06 -0700)]
Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor
Test: make ds-docs
Bug:
1766768
Change-Id: Idfea122569bb6f80889be3f224f9629cfebc0ca3
Andrew Solovay [Fri, 27 Oct 2017 20:55:07 +0000 (13:55 -0700)]
docs: Fixed description of SENSORS permission group
The description had apparently been copied from CAMERA without
alteration.
See first comment for doc stage location.
Bug:
33490521
Test: make ds-docs
Change-Id: I0d5b2ff732e012a70172398dcf264df0ca04aadc
Kevin Hufnagle [Tue, 16 May 2017 23:48:10 +0000 (16:48 -0700)]
cherry-pick from oc-dev: docs: Note regarding device IDs, Build.java
Added note within getSerial() in android.os.Build class. Device
identifiers, such as hardware serial numbers, can be modified if a
device is rooted. Others can use key attestation to discover these
changes. Added a note to this effect within this method.
Test: make ds-docs -j8
Bug:
38312326
Change-Id: I76e3f6a15b9a8673ca3304218653e8cd26da38d7
Original-Change-Id: Ibd2dab621c14683e12a213957b567ee49b8d00fd
Kevin Hufnagle [Wed, 29 Nov 2017 20:06:52 +0000 (12:06 -0800)]
docs: Fixed key generator initialize method call.
The guide within the KeyGenParameterSpec class now uses the correct
method (init() instead of initialize()) to initialize the key
generator in the examples that show how to create AES and HMAC keys.
Test: make ds-docs -j8
Bug:
69093664
Change-Id: I6a9cbe6decd895c2505538f6ad4be91cd9133714
TreeHugger Robot [Tue, 28 Nov 2017 00:28:07 +0000 (00:28 +0000)]
Merge "Add documentation for O and O_MR1 target SDK changes." into oc-mr1-dev