/*
 * Copyright (C) 2012 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package com.android.phone;

import com.android.internal.telephony.DebugService;
import android.app.Service;
import android.content.Intent;
import android.os.IBinder;
import android.util.Log;

import java.io.FileDescriptor;
import java.io.PrintWriter;

/**
 * A debug service for telephony.
 */
public class TelephonyDebugService extends Service {
    private static String TAG = "TelephonyDebugService";
    private DebugService mDebugService = new DebugService();

    /** Constructor */
    public TelephonyDebugService() {
        Log.d(TAG, "TelephonyDebugService()");
    }

    /**
     * {@inheritDoc}
     */
    @Override
    public IBinder onBind(Intent intent) {
        return null;
    }

    @Override
    protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
        enforceCallingOrSelfPermission(android.Manifest.permission.DUMP,
                                       "Requires DUMP");
        mDebugService.dump(fd, pw, args);
    }
}


/*
 * Copyright (C) 2012 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package com.android.phone;

import com.android.internal.telephony.DebugService;
import android.app.Service;
import android.content.Intent;
import android.os.IBinder;
import android.util.Log;

import java.io.FileDescriptor;
import java.io.PrintWriter;

/**
 * A debug service for telephony.
 */
public class TelephonyDebugService extends Service {
    private static String TAG = "TelephonyDebugService";
    private DebugService mDebugService = new DebugService();

    /** Constructor */
    public TelephonyDebugService() {
        Log.d(TAG, "TelephonyDebugService()");
    }

    /**
     * {@inheritDoc}
     */
    @Override
    public IBinder onBind(Intent intent) {
        return null;
    }

    @Override
    protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
        mDebugService.dump(fd, pw, args);
    }
}


Revert "enforce dump permission on dump()"
Revert "enforce dump permission on dump()"

Stability blocker.

java.lang.SecurityException: Requires DUMP: Neither user 1001 nor current process has android.permission.DUMP.
       at android.app.ContextImpl.enforce(ContextImpl.java:1893)
       at android.app.ContextImpl.enforceCallingOrSelfPermission(ContextImpl.java:1922)
       at android.content.ContextWrapper.enforceCallingOrSelfPermission(ContextWrapper.java:593)
       at com.android.phone.TelephonyDebugService.dump(TelephonyDebugService.java:50)
       at android.app.ActivityThread.handleDumpService(ActivityThread.java:2813)
       at android.app.ActivityThread.access$2300(ActivityThread.java:144)
       at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1399)
       at android.os.Handler.dispatchMessage(Handler.java:102)
       at android.os.Looper.loop(Looper.java:135)
       at android.app.ActivityThread.main(ActivityThread.java:5221)
       at java.lang.reflect.Method.invoke(Native Method)
       at java.lang.reflect.Method.invoke(Method.java:372)
       at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:899)
       at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:694)
This reverts commit 8e4dae587f8a4dd20b06c16e4f7fd3723ff56774.

Bug: 18090004
Change-Id: Id9a549971dbe7a5b4baeb7067967cd791541cf4a
