Merge remote-tracking branch 'origin/lineage-22.2' into a15 (ab938bba) · Commits · e / os / android_frameworks_base

packages/SystemUI/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -512,7 +512,7 @@ android_library {
		"androidx.activity_activity-compose",
		"androidx.compose.animation_animation-graphics",
		"androidx.lifecycle_lifecycle-viewmodel-compose",
		"vendor.lineage.powershare-V1.0-java",
		"vendor.lineage.powershare-V1-java",
		],
		libs: [
		"keepanno-annotations",
		@@ -695,7 +695,7 @@ android_library {
		"androidx.lifecycle_lifecycle-viewmodel-compose",
		"TraceurCommon",
		"Traceur-res",
		"vendor.lineage.powershare-V1.0-java",
		"vendor.lineage.powershare-V1-java",
		],
		}

packages/SystemUI/src/com/android/systemui/qs/tiles/PowerShareTile.java

+13 −16

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 The LineageOS Project
		* Copyright (C) 2020-2025 The LineageOS Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -24,7 +24,9 @@ import android.os.BatteryManager;
		import android.os.Handler;
		import android.os.Looper;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.service.quicksettings.Tile;
		import android.util.Log;

		import androidx.annotation.Nullable;

		@@ -45,9 +47,7 @@ import com.android.systemui.statusbar.policy.BatteryController;

		import org.lineageos.internal.logging.LineageMetricsLogger;

		import vendor.lineage.powershare.V1_0.IPowerShare;

		import java.util.NoSuchElementException;
		import vendor.lineage.powershare.IPowerShare;

		import javax.inject.Inject;

		@@ -154,11 +154,8 @@ public class PowerShareTile extends QSTileImpl<BooleanState>
		@Override
		public void handleClick(@Nullable Expandable expandable) {
		try {
		boolean powerShareEnabled = mPowerShare.isEnabled();

		if (mPowerShare.setEnabled(!powerShareEnabled) != powerShareEnabled) {
		mPowerShare.setEnabled(!mPowerShare.isEnabled());
		refreshState();
		}
		} catch (RemoteException ex) {
		ex.printStackTrace();
		}
		@@ -217,16 +214,16 @@ public class PowerShareTile extends QSTileImpl<BooleanState>
		}

		private synchronized IPowerShare getPowerShare() {
		try {
		return IPowerShare.getService();
		} catch (RemoteException ex) {
		ex.printStackTrace();
		} catch (NoSuchElementException ex) {
		// service not available
		}
		final String fqName = IPowerShare.DESCRIPTOR + "/default";

		try {
		return IPowerShare.Stub.asInterface(ServiceManager.getService(fqName));
		} catch (Exception e) {
		// Handle both RemoteException and ServiceNotFoundException
		Log.e(TAG, "Failed to get PowerShare service", e);
		return null;
		}
		}

		private int getMinBatteryLevel() {
		try {