commit c5564b8c0ed06393d6e8f206489e3ec89173d328
author Svetoslav <svetoslavganov@google.com> Fri Sep 05 17:09:44 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 05 17:09:45 2014 +0000
tree 74a83296db84fbec24df264dc4a7e698eaf96de8
parent e2da374d6e7ec176bf682c1dd361e04751b23cb1
parent 53dcd394aa389e1e80aa1113be38255716bf2e4c

Merge "Update FrameStats API per api-council request." into lmp-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index eb458f7..85475fb 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -32507,8 +32507,6 @@
     method public final long getRefreshPeriodNano();
     method public final long getStartTimeNano();
     field public static final long UNDEFINED_TIME_NANO = -1L; // 0xffffffffffffffffL
-    field protected long[] mFramesPresentedTimeNano;
-    field protected long mRefreshPeriodNano;
   }
 
   public class GestureDetector {

core/java/android/view/FrameStats.java

diff --git a/core/java/android/view/FrameStats.java b/core/java/android/view/FrameStats.java
index 541b336..b3ac1db 100644
--- a/core/java/android/view/FrameStats.java
+++ b/core/java/android/view/FrameStats.java
@@ -28,7 +28,10 @@
      */
     public static final long UNDEFINED_TIME_NANO = -1;
 
+    /** @hide */
     protected long mRefreshPeriodNano;
+
+    /** @hide */
     protected long[] mFramesPresentedTimeNano;
 
     /**

packages/PrintSpooler/src/com/android/printspooler/renderer/IPdfRenderer.aidl

diff --git a/packages/PrintSpooler/src/com/android/printspooler/renderer/IPdfRenderer.aidl b/packages/PrintSpooler/src/com/android/printspooler/renderer/IPdfRenderer.aidl
index 1fba2b1..062882c 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/renderer/IPdfRenderer.aidl
+++ b/packages/PrintSpooler/src/com/android/printspooler/renderer/IPdfRenderer.aidl
@@ -29,5 +29,6 @@
     oneway void renderPage(int pageIndex, int bitmapWidth, int bitmapHeight,
         in PrintAttributes attributes, in ParcelFileDescriptor destination);
     oneway void closeDocument();
-    oneway void writePages(in PageRange[] pages);
+    oneway void writePages(in Pagit br
+    geRange[] pages);
 }