summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2010-11-11 17:04:38 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-11-11 17:04:38 -0800
commita09c4b2ec701694b215da271d891ada1a1e20c58 (patch)
tree55c3b0f5627f50fc6e8e5226374ef97215719488
parent7d580b237f9e0e5931a77f3405ee368e599a8163 (diff)
parent7ef3361adc9280d7b43f0f7dcbe1371a0da68a5a (diff)
downloadframeworks_base-a09c4b2ec701694b215da271d891ada1a1e20c58.zip
frameworks_base-a09c4b2ec701694b215da271d891ada1a1e20c58.tar.gz
frameworks_base-a09c4b2ec701694b215da271d891ada1a1e20c58.tar.bz2
Merge "GsmServiceStateTracker#getPhone should be protected not public."
-rw-r--r--telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
index 2cbd63c..632615d 100644
--- a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
@@ -251,7 +251,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
}
@Override
- public Phone getPhone() {
+ protected Phone getPhone() {
return phone;
}