release-request-d1418208-3b0b-4ef9-a2f0-a8f8ac6c24e8-for-git_oc-mr1-release-41... (48f23620) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -46539,6 +46539,7 @@ package android.view {
		method public final boolean isActive();
		method public abstract boolean isFloating();
		method public abstract boolean isShortcutKey(int, android.view.KeyEvent);
		method public boolean isWideColorGamut();
		method public final void makeActive();
		method protected abstract void onActive();
		method public abstract void onConfigurationChanged(android.content.res.Configuration);

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -50086,6 +50086,7 @@ package android.view {
		method public final boolean isActive();
		method public abstract boolean isFloating();
		method public abstract boolean isShortcutKey(int, android.view.KeyEvent);
		method public boolean isWideColorGamut();
		method public final void makeActive();
		method protected abstract void onActive();
		method public abstract void onConfigurationChanged(android.content.res.Configuration);

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -46949,6 +46949,7 @@ package android.view {
		method public final boolean isActive();
		method public abstract boolean isFloating();
		method public abstract boolean isShortcutKey(int, android.view.KeyEvent);
		method public boolean isWideColorGamut();
		method public final void makeActive();
		method protected abstract void onActive();
		method public abstract void onConfigurationChanged(android.content.res.Configuration);

cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java

+93 −18

Original line number	Diff line number	Diff line
		@@ -17,8 +17,8 @@
		package com.android.commands.bmgr;

		import android.app.backup.BackupManager;
		import android.app.backup.BackupManagerMonitor;
		import android.app.backup.BackupProgress;
		import android.app.backup.BackupTransport;
		import android.app.backup.IBackupManager;
		import android.app.backup.IBackupObserver;
		import android.app.backup.IRestoreObserver;
		@@ -30,8 +30,11 @@ import android.content.pm.IPackageManager;
		import android.content.pm.PackageInfo;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.SystemClock;
		import android.os.UserHandle;
		import android.util.Log;
		import android.util.ArraySet;

		import com.android.internal.annotations.GuardedBy;

		import java.util.ArrayList;
		import java.util.HashSet;
		@@ -97,6 +100,11 @@ public final class Bmgr {
		return;
		}

		if ("init".equals(op)) {
		doInit();
		return;
		}

		if ("list".equals(op)) {
		doList();
		return;
		@@ -204,7 +212,7 @@ public final class Bmgr {
		System.out.println("Performing full transport backup");

		String pkg;
		ArrayList<String> allPkgs = new ArrayList<String>();
		ArraySet<String> allPkgs = new ArraySet<String>();
		while ((pkg = nextArg()) != null) {
		allPkgs.add(pkg);
		}
		@@ -218,45 +226,77 @@ public final class Bmgr {
		}
		}

		class BackupObserver extends IBackupObserver.Stub {
		boolean done = false;
		// IBackupObserver generically usable for any backup/init operation
		abstract class Observer extends IBackupObserver.Stub {
		private final Object trigger = new Object();

		@GuardedBy("trigger")
		private volatile boolean done = false;

		@Override
		public void onUpdate(String currentPackage, BackupProgress backupProgress) {
		System.out.println(
		"Package " + currentPackage + " with progress: " + backupProgress.bytesTransferred
		+ "/" + backupProgress.bytesExpected);
		}

		@Override
		public void onResult(String currentPackage, int status) {
		System.out.println("Package " + currentPackage + " with result: "
		+ convertBackupStatusToString(status));
		}

		@Override
		public void backupFinished(int status) {
		System.out.println("Backup finished with result: "
		+ convertBackupStatusToString(status));
		synchronized (this) {
		synchronized (trigger) {
		done = true;
		this.notify();
		trigger.notify();
		}
		}

		public boolean done() {
		return this.done;
		}

		// Wait forever
		public void waitForCompletion() {
		waitForCompletion(0);
		}

		// Wait for a given time and then give up
		public void waitForCompletion(long timeout) {
		// The backupFinished() callback will throw the 'done' flag; we
		// just sit and wait on that notification.
		synchronized (this) {
		while (!this.done) {
		final long targetTime = SystemClock.elapsedRealtime() + timeout;
		synchronized (trigger) {
		// Wait until either we're done, or we've reached a stated positive timeout
		while (!done && (timeout <= 0 \|\| SystemClock.elapsedRealtime() < targetTime)) {
		try {
		this.wait();
		trigger.wait(1000L);
		} catch (InterruptedException ex) {
		}
		}
		}
		}
		}

		class BackupObserver extends Observer {
		@Override
		public void onUpdate(String currentPackage, BackupProgress backupProgress) {
		super.onUpdate(currentPackage, backupProgress);
		System.out.println(
		"Package " + currentPackage + " with progress: " + backupProgress.bytesTransferred
		+ "/" + backupProgress.bytesExpected);
		}

		@Override
		public void onResult(String currentPackage, int status) {
		super.onResult(currentPackage, status);
		System.out.println("Package " + currentPackage + " with result: "
		+ convertBackupStatusToString(status));
		}

		@Override
		public void backupFinished(int status) {
		super.backupFinished(status);
		System.out.println("Backup finished with result: "
		+ convertBackupStatusToString(status));
		}
		}

		private static String convertBackupStatusToString(int errorCode) {
		@@ -349,9 +389,11 @@ public final class Bmgr {
		} else if (pkg.equals("--incremental")) {
		nonIncrementalBackup = false;
		} else {
		if (!allPkgs.contains(pkg)) {
		allPkgs.add(pkg);
		}
		}
		}
		if (backupAll) {
		if (allPkgs.size() == 0) {
		System.out.println("Running " + (nonIncrementalBackup ? "non-" : "") +
		@@ -470,6 +512,39 @@ public final class Bmgr {
		}
		}

		class InitObserver extends Observer {
		public int result = BackupTransport.TRANSPORT_ERROR;

		@Override
		public void backupFinished(int status) {
		super.backupFinished(status);
		result = status;
		}
		}

		private void doInit() {
		ArraySet<String> transports = new ArraySet<>();
		String transport;
		while ((transport = nextArg()) != null) {
		transports.add(transport);
		}
		if (transports.size() == 0) {
		showUsage();
		return;
		}

		InitObserver observer = new InitObserver();
		try {
		System.out.println("Initializing transports: " + transports);
		mBmgr.initializeTransports(transports.toArray(new String[transports.size()]), observer);
		observer.waitForCompletion(30*1000L);
		System.out.println("Initialization result: " + observer.result);
		} catch (RemoteException e) {
		System.err.println(e.toString());
		System.err.println(BMGR_NOT_RUNNING_ERR);
		}
		}

		private void doList() {
		String arg = nextArg(); // sets, transports, packages set#
		if ("transports".equals(arg)) {

cmds/bootanimation/Android.mk

+25 −4

Original line number	Diff line number	Diff line
		@@ -8,10 +8,6 @@ bootanimation_CommonCFlags += -Wall -Werror -Wunused -Wunreachable-code
		LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		bootanimation_main.cpp \
		audioplay.cpp \

		LOCAL_CFLAGS += ${bootanimation_CommonCFlags}

		LOCAL_SHARED_LIBRARIES := \
		@@ -24,6 +20,29 @@ LOCAL_SHARED_LIBRARIES := \
		liblog \
		libutils \

		LOCAL_SRC_FILES:= \
		BootAnimationUtil.cpp \

		ifeq ($(PRODUCT_IOT),true)
		LOCAL_SRC_FILES += \
		iot/iotbootanimation_main.cpp \
		iot/BootAction.cpp

		LOCAL_SHARED_LIBRARIES += \
		libandroidthings \
		libbase \
		libbinder

		LOCAL_STATIC_LIBRARIES += cpufeatures

		else

		LOCAL_SRC_FILES += \
		bootanimation_main.cpp \
		audioplay.cpp \

		endif # PRODUCT_IOT

		LOCAL_MODULE:= bootanimation

		LOCAL_INIT_RC := bootanim.rc
		@@ -45,6 +64,8 @@ LOCAL_CFLAGS += ${bootanimation_CommonCFlags}
		LOCAL_SRC_FILES:= \
		BootAnimation.cpp

		LOCAL_CFLAGS += ${bootanimation_CommonCFlags}

		LOCAL_C_INCLUDES += \
		external/tinyalsa/include \
		frameworks/wilhelm/include