Projects >> frameworks_base_disabled >>5ad5c37ebf8ffff8a85306e02acc6c49daa92903

Chunk
Conflicting content 
    
    public String toString() {
        StringBuilder sb = new StringBuilder(128);
<<<<<<< HEAD
        sb.append("{");
=======
        sb.append("{ fnt=");
>>>>>>> fbdf9df053800afb25453630d11bd48cbc068271
        sb.append(fontScale);
        sb.append("x imsi=");
        sb.append(mcc);
Solution content 
        sb.append(fontScale);
        sb.append("x imsi=");
        sb.append(mcc);
    
    public String toString() {
        StringBuilder sb = new StringBuilder(128);
        sb.append("{");
File
Configuration.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
        @Override
        protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
            mActivityManagerService.dumpApplicationMemoryUsage(fd, pw, "  ", args);
<<<<<<< HEAD
        }
    }

    static class GraphicsBinder extends Binder {
        ActivityManagerService mActivityManagerService;
        GraphicsBinder(ActivityManagerService activityManagerService) {
            mActivityManagerService = activityManagerService;
        }

        @Override
        protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
            mActivityManagerService.dumpGraphicsHardwareUsage(fd, pw, args);
=======
>>>>>>> fbdf9df053800afb25453630d11bd48cbc068271
        }
    }
Solution content 
        @Override
        @Override
        protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
            mActivityManagerService.dumpApplicationMemoryUsage(fd, pw, "  ", args);
        }
    }

    static class GraphicsBinder extends Binder {
        ActivityManagerService mActivityManagerService;
        GraphicsBinder(ActivityManagerService activityManagerService) {
            mActivityManagerService = activityManagerService;
        }
        protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
            mActivityManagerService.dumpGraphicsHardwareUsage(fd, pw, args);
        }
    }
File
ActivityManagerService.java
Developer's decision
Version 1
Kind of conflict
Annotation
Attribute
Class signature
Method declaration
Method invocation
Method signature
Chunk
Conflicting content 
        final String[] args = new String[0];
        for (int i=list.size()-1; i>=0; i--) {
            final ActivityRecord r = (ActivityRecord)list.get(i);
<<<<<<< HEAD
            final boolean full = !brief && (complete || !r.isInHistory());
=======
            final boolean full = !brief && (complete || !r.inHistory);
>>>>>>> fbdf9df053800afb25453630d11bd48cbc068271
            if (needNL) {
                pw.println(" ");
                needNL = false;
Solution content 
        final String[] args = new String[0];
        for (int i=list.size()-1; i>=0; i--) {
            final ActivityRecord r = (ActivityRecord)list.get(i);
            final boolean full = !brief && (complete || !r.isInHistory());
            if (needNL) {
                pw.println(" ");
                needNL = false;
File
ActivityManagerService.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
        return procs;
    }

<<<<<<< HEAD
    final void dumpGraphicsHardwareUsage(FileDescriptor fd,
            PrintWriter pw, String[] args) {
        ArrayList procs = collectProcesses(pw, args);
        if (procs == null) {
            return;
        }

        long uptime = SystemClock.uptimeMillis();
        long realtime = SystemClock.elapsedRealtime();
        pw.println("Applications Graphics Acceleration Info:");
        pw.println("Uptime: " + uptime + " Realtime: " + realtime);
        
        String callArgs[] = {"graphics"};
        for (int i = procs.size() - 1 ; i >= 0 ; i--) {
            ProcessRecord r = procs.get(i);
            if (r.thread != null) {
                pw.println("\n** Graphics info for pid " + r.pid + " [" + r.processName + "] **");
                pw.flush();
                try {
                    TransferPipe.goDump(r.thread.asBinder(), fd, callArgs);
                } catch (IOException e) {
                    pw.println("Failure: " + e);
                    pw.flush();
                } catch (RemoteException e) {
                    pw.println("Got RemoteException!");
                    pw.flush();
                }
            }
        }
    }

=======
>>>>>>> fbdf9df053800afb25453630d11bd48cbc068271
    final void dumpApplicationMemoryUsage(FileDescriptor fd,
            PrintWriter pw, String prefix, String[] args) {
        ArrayList procs = collectProcesses(pw, args);
Solution content 
        return procs;
    }

    final void dumpGraphicsHardwareUsage(FileDescriptor fd,
            PrintWriter pw, String[] args) {
        ArrayList procs = collectProcesses(pw, args);
        if (procs == null) {
            return;
        }

        long uptime = SystemClock.uptimeMillis();
        long realtime = SystemClock.elapsedRealtime();
        pw.println("Applications Graphics Acceleration Info:");
        pw.println("Uptime: " + uptime + " Realtime: " + realtime);
        
        String callArgs[] = {"graphics"};
        for (int i = procs.size() - 1 ; i >= 0 ; i--) {
            ProcessRecord r = procs.get(i);
            if (r.thread != null) {
                pw.println("\n** Graphics info for pid " + r.pid + " [" + r.processName + "] **");
                pw.flush();
                try {
                    TransferPipe.goDump(r.thread.asBinder(), fd, callArgs);
                } catch (IOException e) {
                    pw.println("Failure: " + e);
                    pw.flush();
                } catch (RemoteException e) {
                    pw.println("Got RemoteException!");
                    pw.flush();
                }
            }
        }
    }

    final void dumpApplicationMemoryUsage(FileDescriptor fd,
            PrintWriter pw, String prefix, String[] args) {
        ArrayList procs = collectProcesses(pw, args);
File
ActivityManagerService.java
Developer's decision
Version 1
Kind of conflict
Method declaration