diff options
| author | Alexander Dorokhine <adorokhine@google.com> | 2021-04-21 23:17:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-04-21 23:17:21 +0000 |
| commit | 5681f7c05f6c0abe63f0618bfaf66a9ea113396a (patch) | |
| tree | 87386cbb70ec108f186aa923f5526508574eda1b /core/java | |
| parent | f4c17d8f4c1305511c803dae386e26ea762e70b1 (diff) | |
| parent | ca083d96de44097ec8df227e3e19da3eb31a2adc (diff) | |
Merge "Update framework from jetpack." into sc-dev
Diffstat (limited to 'core/java')
| -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, |