066e8652983b1b46103c545ef73c0f7f07687670 - platform/frameworks/base

commit	066e8652983b1b46103c545ef73c0f7f07687670	[log] [tgz]
author	Shuo Qian <shuoq@google.com>	Wed Apr 25 21:02:35 2018 +0000
committer	Shuo Qian <shuoq@google.com>	Wed Apr 25 23:34:50 2018 +0000
tree	8a97665a6ca44ec29f003bbd35b1ead38330cb4d
parent	cbfa614f6074040eef2a2368855521c17af1bac0 [diff]

Restore the OEM hook implementation and usage

The current plan is to keep the OEM hook implementation in the 
framework, this is for legacy device and old device upgrading 
(per b/78098059).

For P launching device, the OEM hook service is removed in hal, 
so the OEM hook api in framework should return something dummy, and 
prevent infinite loop to get service, but these parts should be done
in seperate CLs after this restore CL is merged.

This reverts commit cbfa614f6074040eef2a2368855521c17af1bac0.

Bug: 34344851
Test: pass Treehugger tests; pass cuttlefish test RilE2eTests
Change-Id: I1f2117331a7f846b192c5f956f3841d58cb8154b

services/core/java/com/android/server/TelephonyRegistry.java[diff]
telephony/java/android/telephony/PhoneStateListener.java[diff]
telephony/java/android/telephony/TelephonyManager.java[diff]
telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl[diff]
telephony/java/com/android/internal/telephony/ITelephony.aidl[diff]
telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl[diff]

6 files changed

tree: 8a97665a6ca44ec29f003bbd35b1ead38330cb4d