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

Commit 2563aa55 authored by Shreerag Jayakrishnan's avatar Shreerag Jayakrishnan
Browse files

Use the right packagename for Wear SystemUI in FlagsManager 

Bug: 339104897
Test: Flippin App doesn't crash on launch
Flag: NONE trivial string fix for Wear
Change-Id: I41a286aa4fd6c18836c5259eaa351a830ab9dc0e
parent 2767bf3c

packages/SystemUI/shared/src/com/android/systemui/flags/FlagManager.kt

+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)

}