am 31d55c61: Merge change 4116 into donut

Merge commit '31d55c618e783d937cb0342c7eeafcd0a6b990fe'

* commit '31d55c618e783d937cb0342c7eeafcd0a6b990fe':
  Add runtest test definition for framework-permission
  - Moved the build variants descriptions into build_system
  Fix the reload of pages after installation of packages.

pdk/README

@@ -57,8 +57,8 @@ You must install google appengine.  See: http://code.google.com/appengine/downlo
 Here's the command to run the pdk-docs server locally:
   python <path_to_appengine_installation>/dev_appserver.py --address 0.0.0.0 \
     <path_to_cupcake_code>/android/out/target/common/docs
-    
+
-To verify it is working you can access it with a browser locally on port 8080:
+To verify it is working, you can access it with a browser locally on port 8080:
 
 http://localhost:8080/online-pdk/guide/index.html
 

pdk/docs/guide/build_new_device.jd

@@ -1,4 +1,4 @@
-page.title=Building Android for a new Device
+page.title=Configuring a New Product
 pdk.version=1.0
 @jd:body
 
@@ -34,10 +34,12 @@ pdk.version=1.0
   # Overrides
   PRODUCT_NAME := <first_product_name>
   PRODUCT_DEVICE := &lt;board_name&gt;</pre>
-  Additional product-specific variables can be added to this <a href="#androidBuildSystemProductDefFiles">Product Definition</a> file. 
+  <li>
-  </li>  
+  Additional product-specific variables can be added to this <a href="#androidBuildSystemProductDefFiles">Product Definition</a> 
+file.
+  </li>
   <li>In the <code>products</code> directory, create an <code>AndroidProducts.mk</code> file that point to (and is responsible for finding) the individual product make files.<BR>
-  <pre class="prettypring">
+  <pre class="prettyprint">
   #
   # This file should set PRODUCT_MAKEFILES to a list of product makefiles
   # to expose to the build system.  LOCAL_DIR will already be set to
@@ -98,8 +100,7 @@ pdk.version=1.0
   #
   # include more board specific stuff here? Such as Audio parameters.      
   #</pre>
-  
+
-  Additional Android.mk parameters 
   </li>
 <li>To create a second product for the same board, create a second product-specific make file called <code>vendor/company_name/products/&lt;second_product_name&gt;.mk</code> that includes:<BR>
 <pre class="prettyprint">

pdk/docs/guide/build_system.jd

@@ -213,8 +213,8 @@ currently-defined build variants:
         <code>eng<code> 
     </td> 
     <td> 
-        This is the default flavor. A plain "<code>make</code>" is the
+        This is the default flavor. A plain <code>make</code> is the
-        same as "<code>make eng</code>".
+        same as <code>make eng</code>.
         <ul> 
         <li>Installs modules tagged with: <code>eng</code>, <code>debug</code>,
             <code>user</code>, and/or <code>development</code>.
@@ -232,7 +232,7 @@ currently-defined build variants:
         <code>user<code> 
     </td> 
     <td> 
-        "<code>make user</code>"
+        <code>make user</code>
         <p> 
         This is the flavor intended to be the final release bits.
         <ul> 
@@ -250,7 +250,7 @@ currently-defined build variants:
         <code>userdebug<code> 
     </td> 
     <td> 
-        "<code>make userdebug</code>"
+        <code>make userdebug</code>
         <p> 
         The same as <code>user</code>, except:
         <ul> 
@@ -263,7 +263,7 @@ currently-defined build variants:
  
 <p> 
 If you build one flavor and then want to build another, you should run
-"<code>make installclean</code>" between the two makes to guarantee that
+<code>make installclean</code> between the two makes to guarantee that
-you don't pick up files installed by the previous flavor.  "<code>make
+you don't pick up files installed by the previous flavor.  <code>make
-clean</code>" will also suffice, but it takes a lot longer.
+clean</code> will also suffice, but it takes a lot longer.
 </p> 

pdk/docs/guide/pdk_toc.cs

@@ -8,11 +8,14 @@ function nothing() {}
 
 <li> <h2>Setup and Building</h2>
   <ul>
-     <li><a href="<?cs var:toroot ?>guide/system_requirements.html">Device Requirements</a></li>           
+     <li class="toggle-list">
-     <li><a href="<?cs var:toroot ?>guide/build_system.html">Build System</a></li>
+     <div><a href="<?cs var:toroot ?>guide/build_system.html">Build System</a></div>
-     <li><a href="<?cs var:toroot ?>guide/build_new_device.html">Building New Device</a></li>
+     <ul>  
-     <li><a href="<?cs var:toroot ?>guide/build_cookbook.html">Build Cookbook</a></li>
+       <li><a href="<?cs var:toroot ?>guide/build_new_device.html">Configuring a New Product</a></li>
-     <li><a href="<?cs var:toroot ?>guide/bring_up.html">Bring up</a></li>
+       <li><a href="<?cs var:toroot ?>guide/build_cookbook.html">Build Cookbook</a></li>
+       <li><a href="<?cs var:toroot ?>guide/bring_up.html">Bring up</a></li>
+     </ul>
+     </li>
      <li><a href="<?cs var:toroot ?>guide/release_keys.html">Release Keys and Signing Builds</a></li> 
  </ul>
 </li>

pdk/docs/guide/sensors.jd

@@ -34,7 +34,8 @@ The types of sensors currently supported by Android include:
 <code>libsensors.so</code> so that it will get loaded from <code>/system/lib</code> at runtime. 
 </p>
 
-<p> The following stub <code>Android.mk</code> file ensures that <code>libsensors</code> compiles and links to the appropriate libraries:</p>
+<p> The following stub file, <code>Android.mk</code>, ensures that <code>libsensors</code> compiles and links to the appropriate libraries:</p>
+
 <pre>
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)

testrunner/test_defs.xml

@@ -180,6 +180,13 @@ Native tests:
     coverage_target="framework"
     continuous="true" />
 
+<test name="framework-permission"
+    build_path="frameworks/base/tests/permission"
+    package="com.android.framework.permission.tests"
+    runner="android.test.InstrumentationTestRunner"
+    coverage_target="framework"
+   />
+
 <!--  cts tests -->
 
 <test name="cts-permission"

tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java

@@ -59,6 +59,8 @@ class UpdaterData {
 
     private final ArrayList<ISdkListener> mListeners = new ArrayList<ISdkListener>();
 
+    private Display mDisplay;
+
     public interface ISdkListener {
         void onSdkChange();
     }
@@ -81,6 +83,10 @@ class UpdaterData {
         return mOsSdkRoot;
     }
 
+    public void setDisplay(Display display) {
+        mDisplay = display;
+    }
+
     public void setTaskFactory(ITaskFactory taskFactory) {
         mTaskFactory = taskFactory;
     }
@@ -166,6 +172,7 @@ class UpdaterData {
         }
 
         // notify adapters?
+        mLocalSdkParser.clearPackages();
         // TODO
 
         // notify listeners
@@ -192,9 +199,8 @@ class UpdaterData {
      * <p/>This can be called from any thread.
      */
     public void notifyListeners() {
-        Display display = Display.getCurrent();
+        if (mDisplay != null && mListeners.size() > 0) {
-        if (display != null && mListeners.size() > 0) {
+            mDisplay.syncExec(new Runnable() {
-            display.syncExec(new Runnable() {
                 public void run() {
                     for (ISdkListener listener : mListeners) {
                         try {
@@ -265,6 +271,9 @@ class UpdaterData {
                     monitor.setDescription("Done. %1$d %2$s installed.",
                             numInstalled,
                             numInstalled == 1 ? "package" : "packages");
+
+                    //notify listeners something was installed, so that they can refresh
+                    reloadSdk();
                 }
             }
         });

tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java

@@ -105,6 +105,7 @@ public class UpdaterWindowImpl {
                 onAndroidSdkUpdaterDispose();    //$hide$ (hide from SWT designer)
             }
         });
+        mUpdaterData.setDisplay(mAndroidSdkUpdater.getDisplay());
 
         FillLayout fl;
         mAndroidSdkUpdater.setLayout(fl = new FillLayout(SWT.HORIZONTAL));