From 7dc7116635ef6001bc18af30ff6bf88576f0b24c Mon Sep 17 00:00:00 2001
From: Tiffany Nguyen <tifn@google.com>
Date: Thu, 15 Apr 2021 04:13:19 +0000
Subject: [PATCH] Update BatterySettingsFeatureProvider to an activity-friendly
 interface.

Test: no implementation
Bug: 181827718
Change-Id: I75959de1e1f347641ca288a30559d83cb8f1e5ad
---
 .../settings/fuelgauge/BatterySettingsFeatureProvider.java   | 4 +++-
 .../fuelgauge/BatterySettingsFeatureProviderImpl.java        | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java b/src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java
index 11f28b7895e..64392226ff2 100644
--- a/src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java
+++ b/src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.fuelgauge;
 
+import android.content.ComponentName;
+
 /**
  * Feature provider for battery settings usage.
  */
@@ -24,6 +26,6 @@ public interface BatterySettingsFeatureProvider {
     /**
      * Get replacement activity for a given activity or fragment path.
      */
-    String getReplacingActivityName(String originalActivity);
+    ComponentName getReplacingActivity(ComponentName originalActivity);
 
 }
diff --git a/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java
index 218d0969560..fda29b8f7ca 100644
--- a/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.fuelgauge;
 
+import android.content.ComponentName;
 import android.content.Context;
 
 /**
@@ -30,7 +31,7 @@ public class BatterySettingsFeatureProviderImpl implements BatterySettingsFeatur
     }
 
     @Override
-    public String getReplacingActivityName(String originalActivity) {
-        return null;
+    public ComponentName getReplacingActivity(ComponentName originalActivity) {
+        return originalActivity;
     }
 }