diff options
| author | Alexander Dorokhine <adorokhine@google.com> | 2021-04-21 11:23:09 -0700 |
|---|---|---|
| committer | Alexander Dorokhine <adorokhine@google.com> | 2021-04-21 11:23:09 -0700 |
| commit | ca083d96de44097ec8df227e3e19da3eb31a2adc (patch) | |
| tree | f3344020f7a1f56e0a9087f92bf6c15bc7936572 /core/java/android | |
| parent | e1bfbd683bbc4dab9ae48b89bb204c49d4d6be43 (diff) | |
Update framework from jetpack.
Included changes:
* b7122be: Update Builders to comply with API council requirements.
* 60b34cd: Changes to AppSearchSchema builders to comply with API requirements.
* c6f7eee: Support property paths in GenericDocument.
* cbee331: Update documentation to distinguish between AppSearchSession and GlobalSearchSession
* cbdd3b9: Rename ReportUsage#usageTimeMillis to #usageTimestampMillis.
* cc09d3a: Implement value indices in GenericDocument.
* e7faa03: Rename isIndexNestedProperties to shouldIndexNestedProperties.
* aaa6e81: Support @CurrentTimeMillisLong in export.
* 388c2b4: Rename GenericDocument's "uri" to "id" everywhere.
Bug: 184576792
Bug: 184576806
Bug: 184174844
Bug: 180481315
Bug: 179797058
Bug: 175146044
Bug: 184175636
Bug: 185492298
Test: Presubmit
Change-Id: I81e396c1d4770479654a3a69ea598e23de88ac9a
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/pm/AppSearchPerson.java | 2 | ||||
| -rw-r--r-- | core/java/android/content/pm/AppSearchShortcutInfo.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/content/pm/AppSearchPerson.java b/core/java/android/content/pm/AppSearchPerson.java index 9283e5fd3cbd..98d150b6ffdd 100644 --- a/core/java/android/content/pm/AppSearchPerson.java +++ b/core/java/android/content/pm/AppSearchPerson.java @@ -91,7 +91,7 @@ public class AppSearchPerson extends GenericDocument { String uri; try { uri = UriCodec.decode( - getUri(), false /* convertPlus */, StandardCharsets.UTF_8, + getId(), false /* convertPlus */, StandardCharsets.UTF_8, true /* throwOnFailure */); } catch (IllegalArgumentException e) { uri = null; diff --git a/core/java/android/content/pm/AppSearchShortcutInfo.java b/core/java/android/content/pm/AppSearchShortcutInfo.java index eb50924579f6..afaecec7a29a 100644 --- a/core/java/android/content/pm/AppSearchShortcutInfo.java +++ b/core/java/android/content/pm/AppSearchShortcutInfo.java @@ -153,8 +153,8 @@ public class AppSearchShortcutInfo extends GenericDocument { .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REPEATED) .build() - ).addProperty(new AppSearchSchema.DocumentPropertyConfig.Builder(KEY_PERSON) - .setSchemaType(AppSearchPerson.SCHEMA_TYPE) + ).addProperty(new AppSearchSchema.DocumentPropertyConfig.Builder( + KEY_PERSON, AppSearchPerson.SCHEMA_TYPE) .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REPEATED) .build() @@ -419,7 +419,7 @@ public class AppSearchShortcutInfo extends GenericDocument { final String bitmapPath = getPropertyString(KEY_BITMAP_PATH); final int disabledReason = Integer.parseInt(getPropertyString(KEY_DISABLED_REASON)); final ShortcutInfo si = new ShortcutInfo( - userId, getUri(), packageName, activity, icon, shortLabel, shortLabelResId, + userId, getId(), packageName, activity, icon, shortLabel, shortLabelResId, shortLabelResName, longLabel, longLabelResId, longLabelResName, disabledMessage, disabledMessageResId, disabledMessageResName, categoriesSet, intents, rank, extras, getCreationTimestampMillis(), flags, iconResId, iconResName, bitmapPath, iconUri, |