OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0780b18
5fb337f
)
Merge "Check for location access on TelephonyRegistry"
author
Hall Liu
<hallliu@google.com>
Wed, 21 Feb 2018 22:42:08 +0000
(22:42 +0000)
committer
Gerrit Code Review
<noreply-gerritcodereview@google.com>
Wed, 21 Feb 2018 22:42:08 +0000
(22:42 +0000)
1
2
data/etc/privapp-permissions-platform.xml
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/TelephonyRegistry.java
patch
|
diff1
|
diff2
|
blob
|
history
telephony/java/android/telephony/SubscriptionManager.java
patch
|
diff1
|
diff2
|
blob
|
history
telephony/java/android/telephony/TelephonyManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
data/etc/privapp-permissions-platform.xml
Simple merge
diff --cc
services/core/java/com/android/server/TelephonyRegistry.java
Simple merge
diff --cc
telephony/java/android/telephony/SubscriptionManager.java
Simple merge
diff --cc
telephony/java/android/telephony/TelephonyManager.java
Simple merge