Snap for 4736748 from fb244816540b39e423b92c0bfb40d4f55124a70f to pi-release (d8ccab53) · Commits · e / os / android_frameworks_native

cmds/atrace/atrace.rc

+6 −0

Original line number	Diff line number	Diff line
		@@ -104,6 +104,12 @@ on post-fs
		chmod 0666 /sys/kernel/tracing/events/block/block_rq_complete/enable
		chmod 0666 /sys/kernel/debug/tracing/events/block/block_rq_complete/enable

		# graphics
		chmod 0666 /sys/kernel/tracing/events/sde/enable
		chmod 0666 /sys/kernel/debug/tracing/events/sde/enable
		chmod 0666 /sys/kernel/tracing/events/mdss/enable
		chmod 0666 /sys/kernel/debug/tracing/events/mdss/enable

		# Tracing disabled by default
		write /sys/kernel/debug/tracing/tracing_on 0
		write /sys/kernel/tracing/tracing_on 0

cmds/dumpstate/dumpstate.cpp

+28 −5

Original line number	Diff line number	Diff line
		@@ -104,6 +104,7 @@ void add_mountinfo();
		#define RAFT_DIR "/data/misc/raft"
		#define RECOVERY_DIR "/cache/recovery"
		#define RECOVERY_DATA_DIR "/data/misc/recovery"
		#define UPDATE_ENGINE_LOG_DIR "/data/misc/update_engine_log"
		#define LOGPERSIST_DATA_DIR "/data/misc/logd"
		#define PROFILE_DATA_DIR_CUR "/data/misc/profiles/cur"
		#define PROFILE_DATA_DIR_REF "/data/misc/profiles/ref"
		@@ -1432,19 +1433,40 @@ static void dumpstate() {
		printf("== Running Application Activities\n");
		printf("========================================================\n");

		RunDumpsys("APP ACTIVITIES", {"activity", "-v", "all"});
		// The following dumpsys internally collects output from running apps, so it can take a long
		// time. So let's extend the timeout.

		const CommandOptions DUMPSYS_COMPONENTS_OPTIONS = CommandOptions::WithTimeout(60).Build();

		RunDumpsys("APP ACTIVITIES", {"activity", "-v", "all"}, DUMPSYS_COMPONENTS_OPTIONS);

		printf("========================================================\n");
		printf("== Running Application Services\n");
		printf("== Running Application Services (platform)\n");
		printf("========================================================\n");

		RunDumpsys("APP SERVICES PLATFORM", {"activity", "service", "all-platform"},
		DUMPSYS_COMPONENTS_OPTIONS);

		printf("========================================================\n");
		printf("== Running Application Services (non-platform)\n");
		printf("========================================================\n");

		RunDumpsys("APP SERVICES NON-PLATFORM", {"activity", "service", "all-non-platform"},
		DUMPSYS_COMPONENTS_OPTIONS);

		printf("========================================================\n");
		printf("== Running Application Providers (platform)\n");
		printf("========================================================\n");

		RunDumpsys("APP SERVICES", {"activity", "service", "all"});
		RunDumpsys("APP PROVIDERS PLATFORM", {"activity", "provider", "all-platform"},
		DUMPSYS_COMPONENTS_OPTIONS);

		printf("========================================================\n");
		printf("== Running Application Providers\n");
		printf("== Running Application Providers (non-platform)\n");
		printf("========================================================\n");

		RunDumpsys("APP PROVIDERS", {"activity", "provider", "all"});
		RunDumpsys("APP PROVIDERS NON-PLATFORM", {"activity", "provider", "all-non-platform"},
		DUMPSYS_COMPONENTS_OPTIONS);

		printf("========================================================\n");
		printf("== Dropbox crashes\n");
		@@ -2126,6 +2148,7 @@ int run_main(int argc, char* argv[]) {

		ds.AddDir(RECOVERY_DIR, true);
		ds.AddDir(RECOVERY_DATA_DIR, true);
		ds.AddDir(UPDATE_ENGINE_LOG_DIR, true);
		ds.AddDir(LOGPERSIST_DATA_DIR, false);
		if (!PropertiesHelper::IsUserBuild()) {
		ds.AddDir(PROFILE_DATA_DIR_CUR, true);

data/etc/android.hardware.strongbox_keystore.xml

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2018 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.
		-->

		<!-- Feature for devices with Keymaster in StrongBox. -->
		<permissions>
		<feature name="android.hardware.strongbox_keystore" />
		</permissions>

libs/binder/Android.bp

+22 −0

Original line number	Diff line number	Diff line
		@@ -75,6 +75,28 @@ cc_library {
		":libbinder_aidl",
		],

		target: {
		vendor: {
		exclude_srcs: [
		"ActivityManager.cpp",
		"AppOpsManager.cpp",
		"IActivityManager.cpp",
		"IAppOpsCallback.cpp",
		"IAppOpsService.cpp",
		"IBatteryStats.cpp",
		"IMediaResourceMonitor.cpp",
		"IPermissionController.cpp",
		"IProcessInfoService.cpp",
		"IUidObserver.cpp",
		"PermissionCache.cpp",
		"PermissionController.cpp",
		"ProcessInfoService.cpp",
		"IpPrefix.cpp",
		":libbinder_aidl",
		],
		},
		},

		aidl: {
		export_aidl_headers: true,
		},

libs/binder/IServiceManager.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,9 @@

		#include <utils/Log.h>
		#include <binder/IPCThreadState.h>
		#ifndef __ANDROID_VNDK__
		#include <binder/IPermissionController.h>
		#endif
		#include <binder/Parcel.h>
		#include <utils/String8.h>
		#include <utils/SystemClock.h>
		@@ -48,6 +51,9 @@ sp<IServiceManager> defaultServiceManager()
		return gDefaultServiceManager;
		}

		#ifndef __ANDROID_VNDK__
		// IPermissionController is not accessible to vendors

		bool checkCallingPermission(const String16& permission)
		{
		return checkCallingPermission(permission, NULL, NULL);
		@@ -122,6 +128,8 @@ bool checkPermission(const String16& permission, pid_t pid, uid_t uid)
		}
		}

		#endif //__ANDROID_VNDK__

		// ----------------------------------------------------------------------

		class BpServiceManager : public BpInterface<IServiceManager>