Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5eed64b9 authored by Shreerag Jayakrishnan's avatar Shreerag Jayakrishnan Committed by Android (Google) Code Review
Browse files

Merge "Use the right packagename for Wear SystemUI in FlagsManager" into main

parents c5be8f91 2563aa55
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@
package com.android.systemui.flags

import android.app.Activity
import android.content.pm.PackageManager
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
@@ -35,6 +36,7 @@ class FlagManager constructor(
) : FlagListenable {
    companion object {
        const val RECEIVING_PACKAGE = "com.android.systemui"
        const val RECEIVING_PACKAGE_WATCH = "com.google.android.apps.wearable.systemui"
        const val ACTION_SET_FLAG = "com.android.systemui.action.SET_FLAG"
        const val ACTION_GET_FLAGS = "com.android.systemui.action.GET_FLAGS"
        const val FLAGS_PERMISSION = "com.android.systemui.permission.FLAGS"
@@ -62,7 +64,7 @@ class FlagManager constructor(

    fun getFlagsFuture(): ListenableFuture<Collection<Flag<*>>> {
        val intent = Intent(ACTION_GET_FLAGS)
        intent.setPackage(RECEIVING_PACKAGE)
        intent.setPackage(if (isWatch()) RECEIVING_PACKAGE_WATCH else RECEIVING_PACKAGE)

        return CallbackToFutureAdapter.getFuture {
                completer: CallbackToFutureAdapter.Completer<Collection<Flag<*>>> ->
@@ -193,6 +195,10 @@ class FlagManager constructor(
        restartAction?.accept(suppressRestart)
    }

    private fun isWatch(): Boolean {
        return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)
    }

    private data class PerFlagListener(val name: String, val listener: FlagListenable.Listener)
}