Privacy Imports about platform_frameworks_base HOT 1 OPEN

And while I am at it, I want to do the same thing with the variable declarations. I know that there is a standard grouping, but this seems like a perfect instance of substance over style. If we put the variables directly under the class declaration, upstream adding or subtracting variables doesn't have to break our patches. In lists like this, each variable is a line instead of part of a line, so it is much easier to break patches because each change completely wipes the context.

So instead of this:

    private boolean mAutomaticPerformanceSnapshots = false;
    private PerformanceCollector mPerformanceCollector;
    private Bundle mPerfMetrics = new Bundle();

    //---------------------------------------------------------------------------------------------
    private PrivacySettingsManager mPrvSvc;
    //---------------------------------------------------------------------------------------------

    public Instrumentation() {

All patches are better served by this:

public class Instrumentation {
    //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
    BEGIN PRIVACY

...

Even if it goes against style here. We declare our Privacy sections in a big flashy way now, I think anyone who needs to understand this will be able to.

from platform_frameworks_base.