From b43cc01144bf82a3f55f88068e38da0dc5d6869d Mon Sep 17 00:00:00 2001
From: Peter Wang <tpwang@google.com>
Date: Mon, 27 Jan 2020 14:41:08 +0800
Subject: [PATCH] [Telephony Mainline] Make ServiceRegisterer static

Bug: 142255256
Test: Build
Change-Id: Ia6860ce495c0957b6ca942356f267298fe8a2843
---
 api/system-current.txt                            | 2 +-
 core/java/android/os/TelephonyServiceManager.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 6a88822ac8da3..2239d3fc3fbbb 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -8845,7 +8845,7 @@ package android.os {
     ctor public TelephonyServiceManager.ServiceNotFoundException(@NonNull String);
   }
 
-  public final class TelephonyServiceManager.ServiceRegisterer {
+  public static final class TelephonyServiceManager.ServiceRegisterer {
     method @Nullable public android.os.IBinder get();
     method @NonNull public android.os.IBinder getOrThrow() throws android.os.TelephonyServiceManager.ServiceNotFoundException;
     method public void register(@NonNull android.os.IBinder);
diff --git a/core/java/android/os/TelephonyServiceManager.java b/core/java/android/os/TelephonyServiceManager.java
index c67dedb4ac171..1128f4cb538ca 100644
--- a/core/java/android/os/TelephonyServiceManager.java
+++ b/core/java/android/os/TelephonyServiceManager.java
@@ -39,7 +39,7 @@ public class TelephonyServiceManager {
     /**
      * A class that exposes the methods to register and obtain each system service.
      */
-    public final class ServiceRegisterer {
+    public static final class ServiceRegisterer {
         private final String mServiceName;
 
         /**