Skip to content

Commit 60a7260

Browse files
author
android-build-team Robot
committed
Snap for 6546046 from 829ac14 to rvc-release
Change-Id: I8ecda25b4236d0d85b7a1d9c5e6e63ce44847f5e
2 parents f049cfd + 829ac14 commit 60a7260

184 files changed

Lines changed: 979 additions & 383 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apex/media/framework/Android.bp‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,14 @@ java_sdk_library {
105105
"framework_media_annotation",
106106
],
107107

108-
visibility: ["//frameworks/av/apex:__subpackages__"],
108+
// Allow access to the stubs from anywhere.
109+
visibility: ["//visibility:public"],
110+
111+
// Restrict access to implementation library.
112+
impl_library_visibility: [
113+
"//visibility:override", // Ignore the visibility property.
114+
"//frameworks/av/apex:__subpackages__",
115+
],
109116
}
110117

111118

‎apex/permission/framework/Android.bp‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,16 @@ filegroup {
2424
java_sdk_library {
2525
name: "framework-permission",
2626
defaults: ["framework-module-defaults"],
27+
28+
// Allow access to the stubs from anywhere.
29+
visibility: ["//visibility:public"],
30+
31+
// Restrict access to implementation library.
32+
impl_library_visibility: [
33+
"//visibility:override", // Ignore the visibility property.
34+
"//frameworks/base/apex/permission:__subpackages__",
35+
],
36+
2737
srcs: [
2838
":framework-permission-sources",
2939
],
@@ -43,8 +53,4 @@ java_sdk_library {
4353
],
4454
hostdex: true,
4555
installable: true,
46-
visibility: [
47-
"//frameworks/base/apex/permission:__subpackages__",
48-
],
49-
stubs_library_visibility: ["//visibility:public"],
5056
}

‎apex/statsd/framework/Android.bp‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,20 @@ java_sdk_library {
7575
],
7676

7777
hostdex: true, // for hiddenapi check
78+
7879
visibility: [
79-
"//frameworks/base/apex/statsd:__subpackages__",
80-
],
81-
stubs_library_visibility: [
8280
"//frameworks/base", // Framework
83-
"//frameworks/base/apex/statsd", // statsd apex
81+
"//frameworks/base/apex/statsd:__subpackages__", // statsd apex
8482
"//frameworks/opt/net/wifi/service", // wifi service
8583
"//packages/providers/MediaProvider", // MediaProvider apk
8684
],
85+
86+
// Restrict access to implementation library.
87+
impl_library_visibility: [
88+
"//visibility:override", // Ignore the visibility property.
89+
"//frameworks/base/apex/statsd:__subpackages__", // statsd apex
90+
],
91+
8792
apex_available: [
8893
"com.android.os.statsd",
8994
"test_com.android.os.statsd",

‎cmds/statsd/src/atoms.proto‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4860,6 +4860,14 @@ message SnapshotMergeReported {
48604860
// Number of reboots that occurred after issuing and before completing the
48614861
// merge of all the snapshot devices.
48624862
optional int32 intermediate_reboots = 3;
4863+
4864+
// The device has been upgraded to Virtual A/B.
4865+
optional bool is_vab_retrofit = 4;
4866+
4867+
// Space that has been temporarily allocated in the /data partition
4868+
// containing the dm-snapshot's copy-on-write data generated during a
4869+
// Virtual A/B update.
4870+
optional int64 cow_file_size_bytes = 5;
48634871
}
48644872

48654873
//////////////////////////////////////////////////////////////////////
@@ -8637,6 +8645,15 @@ message UpdateEngineUpdateAttemptReported {
86378645
// system property when the device takes the update. e.g.
86388646
// Android/aosp_sailfish/sailfish:10/QP1A.190425.004/5507117:userdebug/test-keys
86398647
optional string source_fingerprint = 8;
8648+
8649+
// Size of super partition.
8650+
optional int64 super_partition_size_bytes = 9;
8651+
8652+
// Size of current slot within the super partition.
8653+
optional int64 slot_size_bytes = 10;
8654+
8655+
// Free space available in the super partition.
8656+
optional int64 super_free_space_bytes = 11;
86408657
}
86418658

86428659
/**

‎core/java/android/app/INotificationManager.aidl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ interface INotificationManager
5858

5959
void setShowBadge(String pkg, int uid, boolean showBadge);
6060
boolean canShowBadge(String pkg, int uid);
61+
boolean hasSentValidMsg(String pkg, int uid);
6162
boolean isInInvalidMsgState(String pkg, int uid);
6263
boolean hasUserDemotedInvalidMsgApp(String pkg, int uid);
6364
void setInvalidMsgAppDemoted(String pkg, int uid, boolean isDemoted);

‎core/res/res/values-af/strings.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,10 @@
202202
<string name="printing_disabled_by" msgid="3517499806528864633">"Druk is gedeaktiveer deur <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
203203
<string name="personal_apps_suspension_title" msgid="7561416677884286600">"Skakel jou werkprofiel aan"</string>
204204
<string name="personal_apps_suspension_text" msgid="6115455688932935597">"Jou persoonlike programme word geblokkeer totdat jy jou werkprofiel aanskakel"</string>
205-
<string name="personal_apps_suspension_soon_text" msgid="8705436617422002146">"Persoonlike programme sal op <xliff:g id="DATE">%1$s</xliff:g> om <xliff:g id="TIME">%2$s</xliff:g> geblokkeer word. Jou werkprofiel kan nie meer as <xliff:g id="NUMBER">%3$d</xliff:g> dae lank af bly nie."</string>
206-
<string name="personal_apps_suspended_turn_profile_on" msgid="4278188538997940785">"Skakel werkprofiel aan"</string>
205+
<!-- no translation found for personal_apps_suspension_soon_text (8123898693479590) -->
206+
<skip />
207+
<!-- no translation found for personal_apps_suspended_turn_profile_on (2758012869627513689) -->
208+
<skip />
207209
<string name="me" msgid="6207584824693813140">"Ek"</string>
208210
<string name="power_dialog" product="tablet" msgid="8333207765671417261">"Tablet-opsies"</string>
209211
<string name="power_dialog" product="tv" msgid="7792839006640933763">"Android TV-opsies"</string>
@@ -1548,9 +1550,7 @@
15481550
<string name="launchBrowserDefault" msgid="6328349989932924119">"Begin webblaaier?"</string>
15491551
<string name="SetupCallDefault" msgid="5581740063237175247">"Aanvaar oproep?"</string>
15501552
<string name="activity_resolver_use_always" msgid="5575222334666843269">"Altyd"</string>
1551-
<string name="activity_resolver_set_always" msgid="4142825808921411476">"Stel om altyd oop te maak"</string>
15521553
<string name="activity_resolver_use_once" msgid="948462794469672658">"Net een keer"</string>
1553-
<string name="activity_resolver_app_settings" msgid="6758823206817748026">"Instellings"</string>
15541554
<string name="activity_resolver_work_profiles_support" msgid="4071345609235361269">"%1$s steun nie werkprofiel nie"</string>
15551555
<string name="default_audio_route_name" product="tablet" msgid="367936735632195517">"Tablet"</string>
15561556
<string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string>

‎core/res/res/values-am/strings.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,10 @@
202202
<string name="printing_disabled_by" msgid="3517499806528864633">"ማተም በ<xliff:g id="OWNER_APP">%s</xliff:g> ተሰናክሏል።"</string>
203203
<string name="personal_apps_suspension_title" msgid="7561416677884286600">"የስራ መገለጫዎን ያብሩት"</string>
204204
<string name="personal_apps_suspension_text" msgid="6115455688932935597">"የስራ መገለጫዎን እስኪያበሩት ድረስ የግል መተግበሪያዎችዎ ታግደዋል"</string>
205-
<string name="personal_apps_suspension_soon_text" msgid="8705436617422002146">"የግል መተግበሪያዎች <xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g> ላይ ይታገዳሉ። የእርስዎ የሥራ መገለጫ ከ<xliff:g id="NUMBER">%3$d</xliff:g> ቀኖች በላይ ሳይሠራ መቆየት አይችልም።"</string>
206-
<string name="personal_apps_suspended_turn_profile_on" msgid="4278188538997940785">"የሥራ መገለጫን አብራ"</string>
205+
<!-- no translation found for personal_apps_suspension_soon_text (8123898693479590) -->
206+
<skip />
207+
<!-- no translation found for personal_apps_suspended_turn_profile_on (2758012869627513689) -->
208+
<skip />
207209
<string name="me" msgid="6207584824693813140">"እኔ"</string>
208210
<string name="power_dialog" product="tablet" msgid="8333207765671417261">"የጡባዊ አማራጮች"</string>
209211
<string name="power_dialog" product="tv" msgid="7792839006640933763">"Android TV አማራጮች"</string>
@@ -1548,9 +1550,7 @@
15481550
<string name="launchBrowserDefault" msgid="6328349989932924119">"ማሰሺያን አስነሳ?"</string>
15491551
<string name="SetupCallDefault" msgid="5581740063237175247">"ጥሪ ተቀበል?"</string>
15501552
<string name="activity_resolver_use_always" msgid="5575222334666843269">"ዘወትር"</string>
1551-
<string name="activity_resolver_set_always" msgid="4142825808921411476">"ሁልጊዜ ክፍት ወደ የሚል ተቀናብሯል"</string>
15521553
<string name="activity_resolver_use_once" msgid="948462794469672658">"አንዴ ብቻ"</string>
1553-
<string name="activity_resolver_app_settings" msgid="6758823206817748026">"ቅንብሮች"</string>
15541554
<string name="activity_resolver_work_profiles_support" msgid="4071345609235361269">"%1$s የስራ መገለጫ አይደግፍም"</string>
15551555
<string name="default_audio_route_name" product="tablet" msgid="367936735632195517">"ጡባዊ ተኮ"</string>
15561556
<string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"ቴሌቪዥን"</string>

‎core/res/res/values-ar/strings.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,10 @@
210210
<string name="printing_disabled_by" msgid="3517499806528864633">"تم إيقاف الطباعة بواسطة <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
211211
<string name="personal_apps_suspension_title" msgid="7561416677884286600">"تفعيل الملف الشخصي للعمل"</string>
212212
<string name="personal_apps_suspension_text" msgid="6115455688932935597">"تم حظر تطبيقاتك الشخصية إلى أن تفعِّل ملفك الشخصي للعمل."</string>
213-
<string name="personal_apps_suspension_soon_text" msgid="8705436617422002146">"سيتم حظر التطبيقات الشخصية في <xliff:g id="DATE">%1$s</xliff:g> في <xliff:g id="TIME">%2$s</xliff:g>. لا يمكن أن يظل الملف الشخصي للعمل غير مُفعَّل لأكثر من <xliff:g id="NUMBER">%3$d</xliff:g> يوم."</string>
214-
<string name="personal_apps_suspended_turn_profile_on" msgid="4278188538997940785">"تفعيل الملف الشخصي للعمل"</string>
213+
<!-- no translation found for personal_apps_suspension_soon_text (8123898693479590) -->
214+
<skip />
215+
<!-- no translation found for personal_apps_suspended_turn_profile_on (2758012869627513689) -->
216+
<skip />
215217
<string name="me" msgid="6207584824693813140">"أنا"</string>
216218
<string name="power_dialog" product="tablet" msgid="8333207765671417261">"خيارات الجهاز اللوحي"</string>
217219
<string name="power_dialog" product="tv" msgid="7792839006640933763">"‏خيارات Android TV"</string>
@@ -1632,9 +1634,7 @@
16321634
<string name="launchBrowserDefault" msgid="6328349989932924119">"تشغيل المتصفح؟"</string>
16331635
<string name="SetupCallDefault" msgid="5581740063237175247">"هل تريد قبول المكالمة؟"</string>
16341636
<string name="activity_resolver_use_always" msgid="5575222334666843269">"دائمًا"</string>
1635-
<string name="activity_resolver_set_always" msgid="4142825808921411476">"ضبط على الفتح دائمًا"</string>
16361637
<string name="activity_resolver_use_once" msgid="948462794469672658">"مرة واحدة فقط"</string>
1637-
<string name="activity_resolver_app_settings" msgid="6758823206817748026">"الإعدادات"</string>
16381638
<string name="activity_resolver_work_profiles_support" msgid="4071345609235361269">"‏لا يدعم %1$s الملفات الشخصية للعمل"</string>
16391639
<string name="default_audio_route_name" product="tablet" msgid="367936735632195517">"الجهاز اللوحي"</string>
16401640
<string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"التلفزيون"</string>

‎core/res/res/values-as/strings.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,10 @@
202202
<string name="printing_disabled_by" msgid="3517499806528864633">"প্ৰিণ্ট কৰা কাৰ্য <xliff:g id="OWNER_APP">%s</xliff:g>এ অক্ষম কৰি ৰাখিছে।"</string>
203203
<string name="personal_apps_suspension_title" msgid="7561416677884286600">"কৰ্মস্থানৰ প্ৰ’ফাইলটো অন কৰক"</string>
204204
<string name="personal_apps_suspension_text" msgid="6115455688932935597">"আপুনি নিজৰ কৰ্মস্থানৰ প্ৰ’ফাইলটো অন নকৰালৈকে আপোনাৰ ব্যক্তিগত এপ্‌সমূহ অৱৰোধ কৰা থাকে"</string>
205-
<string name="personal_apps_suspension_soon_text" msgid="8705436617422002146">"<xliff:g id="DATE">%1$s</xliff:g> তাৰিখে <xliff:g id="TIME">%2$s</xliff:g> বজাত ব্যক্তিগত এপ্‌সমূহ অৱৰোধ কৰা হ’ব। আপোনাৰ কৰ্মস্থানৰ প্ৰ’ফাইল <xliff:g id="NUMBER">%3$d</xliff:g> দিনতকৈ বেছি সময়ৰ বাবে বন্ধ হৈ থাকিব নোৱাৰে।"</string>
206-
<string name="personal_apps_suspended_turn_profile_on" msgid="4278188538997940785">"কৰ্মস্থানৰ প্ৰ’ফাইল অন কৰক"</string>
205+
<!-- no translation found for personal_apps_suspension_soon_text (8123898693479590) -->
206+
<skip />
207+
<!-- no translation found for personal_apps_suspended_turn_profile_on (2758012869627513689) -->
208+
<skip />
207209
<string name="me" msgid="6207584824693813140">"মই"</string>
208210
<string name="power_dialog" product="tablet" msgid="8333207765671417261">"টে\'বলেটৰ বিকল্পসমূহ"</string>
209211
<string name="power_dialog" product="tv" msgid="7792839006640933763">"Android TVৰ বিকল্পসমূহ"</string>
@@ -1548,9 +1550,7 @@
15481550
<string name="launchBrowserDefault" msgid="6328349989932924119">"ব্ৰাউজাৰ লঞ্চ কৰিবনে?"</string>
15491551
<string name="SetupCallDefault" msgid="5581740063237175247">"কল স্বীকাৰ কৰিবনে?"</string>
15501552
<string name="activity_resolver_use_always" msgid="5575222334666843269">"সদায়"</string>
1551-
<string name="activity_resolver_set_always" msgid="4142825808921411476">"সদায় খোলক-লৈ ছেট কৰক"</string>
15521553
<string name="activity_resolver_use_once" msgid="948462794469672658">"মাত্ৰ এবাৰ"</string>
1553-
<string name="activity_resolver_app_settings" msgid="6758823206817748026">"ছেটিংসমূহ"</string>
15541554
<string name="activity_resolver_work_profiles_support" msgid="4071345609235361269">"%1$sএ কৰ্মস্থানৰ প্ৰ\'ফাইল সমৰ্থন নকৰে।"</string>
15551555
<string name="default_audio_route_name" product="tablet" msgid="367936735632195517">"টেবলেট"</string>
15561556
<string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"টিভি"</string>

‎core/res/res/values-az/strings.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,10 @@
202202
<string name="printing_disabled_by" msgid="3517499806528864633">"Çap <xliff:g id="OWNER_APP">%s</xliff:g> tərəfindən deaktiv edildi."</string>
203203
<string name="personal_apps_suspension_title" msgid="7561416677884286600">"İş profilinizi aktiv edin"</string>
204204
<string name="personal_apps_suspension_text" msgid="6115455688932935597">"İş profilinizi aktiv edənədək şəxsi tətbiqləriniz bloklanır"</string>
205-
<string name="personal_apps_suspension_soon_text" msgid="8705436617422002146">"Şəxsi tətbiqlər bu tarixdə bloklanacaq: <xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>. İş profiliniz <xliff:g id="NUMBER">%3$d</xliff:g> gündən çox deaktiv qala bilər."</string>
206-
<string name="personal_apps_suspended_turn_profile_on" msgid="4278188538997940785">"İş profilini aktiv edin"</string>
205+
<!-- no translation found for personal_apps_suspension_soon_text (8123898693479590) -->
206+
<skip />
207+
<!-- no translation found for personal_apps_suspended_turn_profile_on (2758012869627513689) -->
208+
<skip />
207209
<string name="me" msgid="6207584824693813140">"Mən"</string>
208210
<string name="power_dialog" product="tablet" msgid="8333207765671417261">"Planşet seçimləri"</string>
209211
<string name="power_dialog" product="tv" msgid="7792839006640933763">"Android TV seçimləri"</string>
@@ -1548,9 +1550,7 @@
15481550
<string name="launchBrowserDefault" msgid="6328349989932924119">"Brauzer işə salınsın?"</string>
15491551
<string name="SetupCallDefault" msgid="5581740063237175247">"Zəngi qəbul edək?"</string>
15501552
<string name="activity_resolver_use_always" msgid="5575222334666843269">"Həmişə"</string>
1551-
<string name="activity_resolver_set_always" msgid="4142825808921411476">"\"Həmişə açıq\" olaraq ayarlayın"</string>
15521553
<string name="activity_resolver_use_once" msgid="948462794469672658">"Sadəcə bir dəfə"</string>
1553-
<string name="activity_resolver_app_settings" msgid="6758823206817748026">"Ayarlar"</string>
15541554
<string name="activity_resolver_work_profiles_support" msgid="4071345609235361269">"%1$s iş profilini dəstəkləmir"</string>
15551555
<string name="default_audio_route_name" product="tablet" msgid="367936735632195517">"Planşet"</string>
15561556
<string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string>

0 commit comments

Comments
 (0)