Snap for 7085329 from 6e816f4425a9838e3f561383d9a22114e82f6419 to rvc-qpr3-release (783df5b0) · Commits · e / os / android_frameworks_base

core/java/android/app/AppOpsManager.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -7623,8 +7623,8 @@ public class AppOpsManager {
		} else if (collectionMode == COLLECT_SYNC
		// Only collect app-ops when the proxy is trusted
		&& (mContext.checkPermission(Manifest.permission.UPDATE_APP_OPS_STATS, -1,
		myUid) == PackageManager.PERMISSION_GRANTED
		\|\| isTrustedVoiceServiceProxy(mContext, mContext.getOpPackageName(), op))) {
		myUid) == PackageManager.PERMISSION_GRANTED \|\| isTrustedVoiceServiceProxy(
		mContext, mContext.getOpPackageName(), op, mContext.getUserId()))) {
		collectNotedOpSync(op, proxiedAttributionTag);
		}
		}
		@@ -7642,7 +7642,7 @@ public class AppOpsManager {
		* @hide
		*/
		public static boolean isTrustedVoiceServiceProxy(Context context, String packageName,
		int code) {
		int code, int userId) {
		// This is a workaround for R QPR, new API change is not allowed. We only allow the current
		// voice recognizer is also the voice interactor to noteproxy op.
		if (code != OP_RECORD_AUDIO) {
		@@ -7654,7 +7654,7 @@ public class AppOpsManager {
		final String voiceRecognitionServicePackageName =
		getComponentPackageNameFromString(voiceRecognitionComponent);
		return (Objects.equals(packageName, voiceRecognitionServicePackageName))
		&& isPackagePreInstalled(context, packageName);
		&& isPackagePreInstalled(context, packageName, userId);
		}

		private static String getComponentPackageNameFromString(String from) {
		@@ -7662,10 +7662,10 @@ public class AppOpsManager {
		return componentName != null ? componentName.getPackageName() : "";
		}

		private static boolean isPackagePreInstalled(Context context, String packageName) {
		private static boolean isPackagePreInstalled(Context context, String packageName, int userId) {
		try {
		final PackageManager pm = context.getPackageManager();
		final ApplicationInfo info = pm.getApplicationInfo(packageName, 0);
		final ApplicationInfo info = pm.getApplicationInfoAsUser(packageName, 0, userId);
		return ((info.flags & ApplicationInfo.FLAG_SYSTEM) != 0);
		} catch (PackageManager.NameNotFoundException e) {
		return false;

data/etc/car/Android.bp

+0 −7

Original line number	Diff line number	Diff line
		@@ -150,13 +150,6 @@ prebuilt_etc {
		system_ext_specific: true,
		}

		prebuilt_etc {
		name: "privapp_whitelist_com.android.car.floatingcardslauncher",
		sub_dir: "permissions",
		src: "com.android.car.floatingcardslauncher.xml",
		filename_from_src: true,
		}

		prebuilt_etc {
		name: "privapp_whitelist_com.android.car.ui.paintbooth",
		sub_dir: "permissions",

data/etc/car/com.android.car.floatingcardslauncher.xml

deleted100644 → 0

+0 −25

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2019 The Android Open Source Project
		~
		~ Licensed under the Apache License, Version 2.0 (the "License");
		~ you may not use this file except in compliance with the License.
		~ You may obtain a copy of the License at
		~
		~ http://www.apache.org/licenses/LICENSE-2.0
		~
		~ Unless required by applicable law or agreed to in writing, software
		~ distributed under the License is distributed on an "AS IS" BASIS,
		~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		~ See the License for the specific language governing permissions and
		~ limitations under the License
		-->
		<permissions>
		<privapp-permissions package="com.android.car.floatingcardslauncher">
		<permission name="android.permission.ACTIVITY_EMBEDDING"/>
		<permission name="android.permission.INTERACT_ACROSS_USERS"/>
		<permission name="android.permission.MANAGE_USERS"/>
		<permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
		<permission name="android.permission.MODIFY_PHONE_STATE"/>
		</privapp-permissions>
		</permissions>

packages/SettingsLib/res/values-kk/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -359,7 +359,7 @@
		<string name="enable_gpu_debug_layers" msgid="4986675516188740397">"GPU жөндеу қабаттарын қосу"</string>
		<string name="enable_gpu_debug_layers_summary" msgid="4921521407377170481">"GPU жөндеу қабаттарының жүктелуіне рұқсат ету"</string>
		<string name="enable_verbose_vendor_logging" msgid="1196698788267682072">"Жеткізушілерді журналға тіркеу"</string>
		<string name="enable_verbose_vendor_logging_summary" msgid="5426292185780393708">"Қате туралы есепте қызмет көрсетушінің құрылғыға қатысты қосымша ақпаратын қамту. Мұнда жеке ақпарат көрсетілуі, батарея шығыны артуы және/немесе қосымша жад пайдаланылуы мүмкін."</string>
		<string name="enable_verbose_vendor_logging_summary" msgid="5426292185780393708">"Қате туралы есепте жеткізушінің құрылғыға қатысты қосымша ақпараты қамтылады. Мұнда жеке ақпарат көрсетілуі, батарея шығыны артуы және/немесе қосымша жад пайдаланылуы мүмкін."</string>
		<string name="window_animation_scale_title" msgid="5236381298376812508">"Терезе анимациясының өлшемі"</string>
		<string name="transition_animation_scale_title" msgid="1278477690695439337">"Ауысу анимациясының өлшемі"</string>
		<string name="animator_duration_scale_title" msgid="7082913931326085176">"Аниматор ұзақтығы"</string>

packages/SettingsLib/res/values-mr/strings.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -168,7 +168,7 @@
		<string name="tts_play_example_summary" msgid="634044730710636383">"उच्चार संश्लेषणाचे एक छोटेसे प्रात्यक्षिक प्ले करा"</string>
		<string name="tts_install_data_title" msgid="1829942496472751703">"व्हॉइस डेटा इंस्टॉल करा"</string>
		<string name="tts_install_data_summary" msgid="3608874324992243851">"उच्चार संश्लेषणासाठी आवश्यक आवाज डेटा इंस्टॉल करा"</string>
		<string name="tts_engine_security_warning" msgid="3372432853837988146">"हे उच्चार संश्लेषण इंजिन पासवर्ड आणि क्रेडिट कार्ड नंबर यासारख्या वैयक्तिक मजकुरासह, बोलला जाणारा सर्व मजकूर संकलित करण्यात सक्षम होऊ शकते. हे <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> इंजिनवरून येते. या उच्चार संश्लेषण इंजिनचा वापर सक्षम करायचा?"</string>
		<string name="tts_engine_security_warning" msgid="3372432853837988146">"हे उच्चार संश्लेषण इंजीन पासवर्ड आणि क्रेडिट कार्ड नंबर यासारख्या वैयक्तिक मजकुरासह, बोलला जाणारा सर्व मजकूर संकलित करण्यात सक्षम होऊ शकते. हे <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> इंजीनवरून येते. या उच्चार संश्लेषण इंजीनचा वापर सक्षम करायचा?"</string>
		<string name="tts_engine_network_required" msgid="8722087649733906851">"या भाषेस टेक्‍स्‍ट टू स्‍पीचसाठी एका नेटवर्क कनेक्शनची आवश्यकता आहे."</string>
		<string name="tts_default_sample_string" msgid="6388016028292967973">"हे उच्चार संश्लेषणाचे एक उदाहरण आहे"</string>
		<string name="tts_status_title" msgid="8190784181389278640">"डीफॉल्ट भाषा स्थिती"</string>
		@@ -177,8 +177,8 @@
		<string name="tts_status_not_supported" msgid="2702997696245523743">"<xliff:g id="LOCALE">%1$s</xliff:g> समर्थित नाही"</string>
		<string name="tts_status_checking" msgid="8026559918948285013">"तपासत आहे..."</string>
		<string name="tts_engine_settings_title" msgid="7849477533103566291">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> साठी सेटिंग्ज"</string>
		<string name="tts_engine_settings_button" msgid="477155276199968948">"इंजिन सेटिंग्ज लाँच करा"</string>
		<string name="tts_engine_preference_section_title" msgid="3861562305498624904">"प्राधान्य इंजिन"</string>
		<string name="tts_engine_settings_button" msgid="477155276199968948">"इंजीन सेटिंग्ज लाँच करा"</string>
		<string name="tts_engine_preference_section_title" msgid="3861562305498624904">"प्राधान्य इंजीन"</string>
		<string name="tts_general_section_title" msgid="8919671529502364567">"सामान्य"</string>
		<string name="tts_reset_speech_pitch_title" msgid="7149398585468413246">"उच्चार पिच रीसेट करा"</string>
		<string name="tts_reset_speech_pitch_summary" msgid="6822904157021406449">"डीफॉल्टवर मजकूर ज्या पिचवर बोलला जातो तो रीसेट करा."</string>