diff options
229 files changed, 6157 insertions, 3567 deletions
@@ -214,7 +214,7 @@ LOCAL_SRC_FILES += \ core/java/android/os/IUserManager.aidl \ core/java/android/os/IVibratorService.aidl \ core/java/android/security/IKeystoreService.aidl \ - core/java/android/service/carrier/ICarrierConfigService.aidl \ + core/java/android/service/carrier/ICarrierService.aidl \ core/java/android/service/carrier/ICarrierMessagingCallback.aidl \ core/java/android/service/carrier/ICarrierMessagingService.aidl \ core/java/android/service/gatekeeper/IGateKeeperService.aidl \ @@ -775,6 +775,7 @@ sample_groups := -samplegroup Admin \ -samplegroup RenderScript \ -samplegroup Security \ -samplegroup Sensors \ + -samplegroup System \ -samplegroup Testing \ -samplegroup UI \ -samplegroup Views \ diff --git a/api/current.txt b/api/current.txt index aa29ae8..376037a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -106,7 +106,7 @@ package android { field public static final deprecated java.lang.String READ_INPUT_STATE = "android.permission.READ_INPUT_STATE"; field public static final java.lang.String READ_LOGS = "android.permission.READ_LOGS"; field public static final java.lang.String READ_PHONE_STATE = "android.permission.READ_PHONE_STATE"; - field public static final java.lang.String READ_PROFILE = "android.permission.READ_PROFILE"; + field public static final deprecated java.lang.String READ_PROFILE = "android.permission.READ_PROFILE"; field public static final java.lang.String READ_SMS = "android.permission.READ_SMS"; field public static final deprecated java.lang.String READ_SOCIAL_STREAM = "android.permission.READ_SOCIAL_STREAM"; field public static final java.lang.String READ_SYNC_SETTINGS = "android.permission.READ_SYNC_SETTINGS"; @@ -120,6 +120,7 @@ package android { field public static final java.lang.String RECEIVE_WAP_PUSH = "android.permission.RECEIVE_WAP_PUSH"; field public static final java.lang.String RECORD_AUDIO = "android.permission.RECORD_AUDIO"; field public static final java.lang.String REORDER_TASKS = "android.permission.REORDER_TASKS"; + field public static final java.lang.String REQUEST_INSTALL_PACKAGES = "android.permission.REQUEST_INSTALL_PACKAGES"; field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES"; field public static final java.lang.String SEND_RESPOND_VIA_MESSAGE = "android.permission.SEND_RESPOND_VIA_MESSAGE"; field public static final java.lang.String SEND_SMS = "android.permission.SEND_SMS"; @@ -154,7 +155,7 @@ package android { field public static final java.lang.String WRITE_EXTERNAL_STORAGE = "android.permission.WRITE_EXTERNAL_STORAGE"; field public static final java.lang.String WRITE_GSERVICES = "android.permission.WRITE_GSERVICES"; field public static final java.lang.String WRITE_HISTORY_BOOKMARKS = "com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"; - field public static final java.lang.String WRITE_PROFILE = "android.permission.WRITE_PROFILE"; + field public static final deprecated java.lang.String WRITE_PROFILE = "android.permission.WRITE_PROFILE"; field public static final java.lang.String WRITE_SECURE_SETTINGS = "android.permission.WRITE_SECURE_SETTINGS"; field public static final java.lang.String WRITE_SETTINGS = "android.permission.WRITE_SETTINGS"; field public static final deprecated java.lang.String WRITE_SOCIAL_STREAM = "android.permission.WRITE_SOCIAL_STREAM"; @@ -8907,6 +8908,7 @@ package android.content.pm { field public static final int FLAG_EXTRACT_NATIVE_LIBS = 268435456; // 0x10000000 field public static final int FLAG_FACTORY_TEST = 16; // 0x10 field public static final int FLAG_FULL_BACKUP_ONLY = 67108864; // 0x4000000 + field public static final int FLAG_HARDWARE_ACCELERATED = 536870912; // 0x20000000 field public static final int FLAG_HAS_CODE = 4; // 0x4 field public static final int FLAG_INSTALLED = 8388608; // 0x800000 field public static final int FLAG_IS_DATA_ONLY = 16777216; // 0x1000000 @@ -8936,7 +8938,6 @@ package android.content.pm { field public int descriptionRes; field public boolean enabled; field public int flags; - field public boolean hardwareAccelerated; field public int largestWidthLimitDp; field public java.lang.String manageSpaceActivityName; field public java.lang.String nativeLibraryDir; @@ -12255,7 +12256,6 @@ package android.graphics.drawable { method public android.graphics.drawable.Drawable getCurrent(); method public android.graphics.Rect getDirtyBounds(); method public boolean getDither(); - method public boolean getFilterBitmap(); method public void getHotspotBounds(android.graphics.Rect); method public int getIntrinsicHeight(); method public int getIntrinsicWidth(); @@ -12272,12 +12272,13 @@ package android.graphics.drawable { method public void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException; method public void invalidateSelf(); method public boolean isAutoMirrored(); + method public boolean isFilterBitmap(); method public boolean isStateful(); method public final boolean isVisible(); method public void jumpToCurrentState(); method public android.graphics.drawable.Drawable mutate(); method protected void onBoundsChange(android.graphics.Rect); - method public boolean onLayoutDirectionChange(int); + method public boolean onLayoutDirectionChanged(int); method protected boolean onLevelChange(int); method protected boolean onStateChange(int[]); method public static int resolveOpacity(int, int); @@ -15910,6 +15911,7 @@ package android.media { field public static final java.lang.String MIMETYPE_AUDIO_AC3 = "audio/ac3"; field public static final java.lang.String MIMETYPE_AUDIO_AMR_NB = "audio/3gpp"; field public static final java.lang.String MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb"; + field public static final java.lang.String MIMETYPE_AUDIO_EAC3 = "audio/eac3"; field public static final java.lang.String MIMETYPE_AUDIO_FLAC = "audio/flac"; field public static final java.lang.String MIMETYPE_AUDIO_G711_ALAW = "audio/g711-alaw"; field public static final java.lang.String MIMETYPE_AUDIO_G711_MLAW = "audio/g711-mlaw"; @@ -28558,13 +28560,6 @@ package android.security.keystore { package android.service.carrier { - public abstract class CarrierConfigService extends android.app.Service { - ctor public CarrierConfigService(); - method public final android.os.IBinder onBind(android.content.Intent); - method public abstract android.os.PersistableBundle onLoadConfig(android.service.carrier.CarrierIdentifier); - field public static final java.lang.String SERVICE_INTERFACE = "android.service.carrier.CarrierConfigService"; - } - public class CarrierIdentifier implements android.os.Parcelable { ctor public CarrierIdentifier(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String); method public int describeContents(); @@ -28622,6 +28617,14 @@ package android.service.carrier { method public int getSendStatus(); } + public abstract class CarrierService extends android.app.Service { + ctor public CarrierService(); + method public final android.os.IBinder onBind(android.content.Intent); + method public abstract android.os.PersistableBundle onLoadConfig(android.service.carrier.CarrierIdentifier); + field public static final java.lang.String BIND_SERVICE_INTERFACE = "android.service.carrier.BindService"; + field public static final java.lang.String CONFIG_SERVICE_INTERFACE = "android.service.carrier.ConfigService"; + } + public final class MessagePdu implements android.os.Parcelable { ctor public MessagePdu(java.util.List<byte[]>); method public int describeContents(); diff --git a/api/system-current.txt b/api/system-current.txt index 0279b4a..e3c7414 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -155,7 +155,7 @@ package android { field public static final java.lang.String READ_NETWORK_USAGE_HISTORY = "android.permission.READ_NETWORK_USAGE_HISTORY"; field public static final java.lang.String READ_PHONE_STATE = "android.permission.READ_PHONE_STATE"; field public static final java.lang.String READ_PRIVILEGED_PHONE_STATE = "android.permission.READ_PRIVILEGED_PHONE_STATE"; - field public static final java.lang.String READ_PROFILE = "android.permission.READ_PROFILE"; + field public static final deprecated java.lang.String READ_PROFILE = "android.permission.READ_PROFILE"; field public static final java.lang.String READ_SEARCH_INDEXABLES = "android.permission.READ_SEARCH_INDEXABLES"; field public static final java.lang.String READ_SMS = "android.permission.READ_SMS"; field public static final deprecated java.lang.String READ_SOCIAL_STREAM = "android.permission.READ_SOCIAL_STREAM"; @@ -180,6 +180,7 @@ package android { field public static final java.lang.String REGISTER_SIM_SUBSCRIPTION = "android.permission.REGISTER_SIM_SUBSCRIPTION"; field public static final java.lang.String REMOVE_DRM_CERTIFICATES = "android.permission.REMOVE_DRM_CERTIFICATES"; field public static final java.lang.String REORDER_TASKS = "android.permission.REORDER_TASKS"; + field public static final java.lang.String REQUEST_INSTALL_PACKAGES = "android.permission.REQUEST_INSTALL_PACKAGES"; field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES"; field public static final java.lang.String RETRIEVE_WINDOW_CONTENT = "android.permission.RETRIEVE_WINDOW_CONTENT"; field public static final java.lang.String SCORE_NETWORKS = "android.permission.SCORE_NETWORKS"; @@ -227,7 +228,7 @@ package android { field public static final java.lang.String WRITE_GSERVICES = "android.permission.WRITE_GSERVICES"; field public static final java.lang.String WRITE_HISTORY_BOOKMARKS = "com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"; field public static final java.lang.String WRITE_MEDIA_STORAGE = "android.permission.WRITE_MEDIA_STORAGE"; - field public static final java.lang.String WRITE_PROFILE = "android.permission.WRITE_PROFILE"; + field public static final deprecated java.lang.String WRITE_PROFILE = "android.permission.WRITE_PROFILE"; field public static final java.lang.String WRITE_SECURE_SETTINGS = "android.permission.WRITE_SECURE_SETTINGS"; field public static final java.lang.String WRITE_SETTINGS = "android.permission.WRITE_SETTINGS"; field public static final deprecated java.lang.String WRITE_SOCIAL_STREAM = "android.permission.WRITE_SOCIAL_STREAM"; @@ -9136,6 +9137,7 @@ package android.content.pm { field public static final int FLAG_EXTRACT_NATIVE_LIBS = 268435456; // 0x10000000 field public static final int FLAG_FACTORY_TEST = 16; // 0x10 field public static final int FLAG_FULL_BACKUP_ONLY = 67108864; // 0x4000000 + field public static final int FLAG_HARDWARE_ACCELERATED = 536870912; // 0x20000000 field public static final int FLAG_HAS_CODE = 4; // 0x4 field public static final int FLAG_INSTALLED = 8388608; // 0x800000 field public static final int FLAG_IS_DATA_ONLY = 16777216; // 0x1000000 @@ -9165,7 +9167,6 @@ package android.content.pm { field public int descriptionRes; field public boolean enabled; field public int flags; - field public boolean hardwareAccelerated; field public int largestWidthLimitDp; field public java.lang.String manageSpaceActivityName; field public java.lang.String nativeLibraryDir; @@ -12562,7 +12563,6 @@ package android.graphics.drawable { method public android.graphics.drawable.Drawable getCurrent(); method public android.graphics.Rect getDirtyBounds(); method public boolean getDither(); - method public boolean getFilterBitmap(); method public void getHotspotBounds(android.graphics.Rect); method public int getIntrinsicHeight(); method public int getIntrinsicWidth(); @@ -12579,12 +12579,13 @@ package android.graphics.drawable { method public void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException; method public void invalidateSelf(); method public boolean isAutoMirrored(); + method public boolean isFilterBitmap(); method public boolean isStateful(); method public final boolean isVisible(); method public void jumpToCurrentState(); method public android.graphics.drawable.Drawable mutate(); method protected void onBoundsChange(android.graphics.Rect); - method public boolean onLayoutDirectionChange(int); + method public boolean onLayoutDirectionChanged(int); method protected boolean onLevelChange(int); method protected boolean onStateChange(int[]); method public static int resolveOpacity(int, int); @@ -17146,6 +17147,7 @@ package android.media { field public static final java.lang.String MIMETYPE_AUDIO_AC3 = "audio/ac3"; field public static final java.lang.String MIMETYPE_AUDIO_AMR_NB = "audio/3gpp"; field public static final java.lang.String MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb"; + field public static final java.lang.String MIMETYPE_AUDIO_EAC3 = "audio/eac3"; field public static final java.lang.String MIMETYPE_AUDIO_FLAC = "audio/flac"; field public static final java.lang.String MIMETYPE_AUDIO_G711_ALAW = "audio/g711-alaw"; field public static final java.lang.String MIMETYPE_AUDIO_G711_MLAW = "audio/g711-mlaw"; @@ -30584,13 +30586,6 @@ package android.security.keystore { package android.service.carrier { - public abstract class CarrierConfigService extends android.app.Service { - ctor public CarrierConfigService(); - method public final android.os.IBinder onBind(android.content.Intent); - method public abstract android.os.PersistableBundle onLoadConfig(android.service.carrier.CarrierIdentifier); - field public static final java.lang.String SERVICE_INTERFACE = "android.service.carrier.CarrierConfigService"; - } - public class CarrierIdentifier implements android.os.Parcelable { ctor public CarrierIdentifier(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String); method public int describeContents(); @@ -30648,6 +30643,14 @@ package android.service.carrier { method public int getSendStatus(); } + public abstract class CarrierService extends android.app.Service { + ctor public CarrierService(); + method public final android.os.IBinder onBind(android.content.Intent); + method public abstract android.os.PersistableBundle onLoadConfig(android.service.carrier.CarrierIdentifier); + field public static final java.lang.String BIND_SERVICE_INTERFACE = "android.service.carrier.BindService"; + field public static final java.lang.String CONFIG_SERVICE_INTERFACE = "android.service.carrier.ConfigService"; + } + public final class MessagePdu implements android.os.Parcelable { ctor public MessagePdu(java.util.List<byte[]>); method public int describeContents(); diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java index e0a30ad..3b026d2 100644 --- a/core/java/android/app/FragmentManager.java +++ b/core/java/android/app/FragmentManager.java @@ -19,6 +19,9 @@ package android.app; import android.animation.Animator; import android.animation.AnimatorInflater; import android.animation.AnimatorListenerAdapter; +import android.animation.AnimatorSet; +import android.animation.PropertyValuesHolder; +import android.animation.ValueAnimator; import android.content.Context; import android.content.res.Configuration; import android.content.res.TypedArray; @@ -403,6 +406,44 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate static final String VIEW_STATE_TAG = "android:view_state"; static final String USER_VISIBLE_HINT_TAG = "android:user_visible_hint"; + static class AnimateOnHWLayerIfNeededListener implements Animator.AnimatorListener { + private boolean mShouldRunOnHWLayer = false; + private View mView; + public AnimateOnHWLayerIfNeededListener(final View v) { + if (v == null) { + return; + } + mView = v; + } + + @Override + public void onAnimationStart(Animator animation) { + mShouldRunOnHWLayer = shouldRunOnHWLayer(mView, animation); + if (mShouldRunOnHWLayer) { + mView.setLayerType(View.LAYER_TYPE_HARDWARE, null); + } + } + + @Override + public void onAnimationEnd(Animator animation) { + if (mShouldRunOnHWLayer) { + mView.setLayerType(View.LAYER_TYPE_NONE, null); + } + mView = null; + animation.removeListener(this); + } + + @Override + public void onAnimationCancel(Animator animation) { + + } + + @Override + public void onAnimationRepeat(Animator animation) { + + } + } + ArrayList<Runnable> mPendingActions; Runnable[] mTmpActions; boolean mExecutingActions; @@ -467,6 +508,50 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate throw ex; } + static boolean modifiesAlpha(Animator anim) { + if (anim == null) { + return false; + } + if (anim instanceof ValueAnimator) { + ValueAnimator valueAnim = (ValueAnimator) anim; + PropertyValuesHolder[] values = valueAnim.getValues(); + for (int i = 0; i < values.length; i++) { + if (("alpha").equals(values[i].getPropertyName())) { + return true; + } + } + } else if (anim instanceof AnimatorSet) { + List<Animator> animList = ((AnimatorSet) anim).getChildAnimations(); + for (int i = 0; i < animList.size(); i++) { + if (modifiesAlpha(animList.get(i))) { + return true; + } + } + } + return false; + } + + static boolean shouldRunOnHWLayer(View v, Animator anim) { + if (v == null || anim == null) { + return false; + } + return v.getLayerType() == View.LAYER_TYPE_NONE + && v.hasOverlappingRendering() + && modifiesAlpha(anim); + } + + /** + * Sets the to be animated view on hardware layer during the animation. + */ + private void setHWLayerAnimListenerIfAlpha(final View v, Animator anim) { + if (v == null || anim == null) { + return; + } + if (shouldRunOnHWLayer(v, anim)) { + anim.addListener(new AnimateOnHWLayerIfNeededListener(v)); + } + } + @Override public FragmentTransaction beginTransaction() { return new BackStackRecord(this); @@ -894,6 +979,7 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate transitionStyle); if (anim != null) { anim.setTarget(f.mView); + setHWLayerAnimListenerIfAlpha(f.mView, anim); anim.start(); } container.addView(f.mView); @@ -975,6 +1061,7 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate } }); anim.setTarget(f.mView); + setHWLayerAnimListenerIfAlpha(f.mView, anim); anim.start(); } @@ -1188,6 +1275,7 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate } } }); + setHWLayerAnimListenerIfAlpha(finalFragment.mView, anim); anim.start(); } else { fragment.mView.setVisibility(View.GONE); @@ -1209,6 +1297,7 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate transitionStyle); if (anim != null) { anim.setTarget(fragment.mView); + setHWLayerAnimListenerIfAlpha(fragment.mView, anim); anim.start(); } fragment.mView.setVisibility(View.VISIBLE); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 52ccd7b..978b4bc 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3071,12 +3071,12 @@ public class DevicePolicyManager { public void setProfileName(ComponentName who, String profileName) { if (mService != null) { try { - mService.setProfileName(who, profileName); - } catch (RemoteException e) { - Log.w(TAG, "Failed talking with device policy service", e); + mService.setProfileName(who, profileName); + } catch (RemoteException e) { + Log.w(TAG, "Failed talking with device policy service", e); + } } } -} /** * Used to determine if a particular package is registered as the profile owner for the diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 62a1617..c01ce4f 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -1387,6 +1387,11 @@ public class Intent implements Parcelable, Cloneable { * <p> * Output: If {@link #EXTRA_RETURN_RESULT}, returns whether the install * succeeded. + * <p> + * <strong>Note:</strong>If your app is targeting API level higher than 22 you + * need to hold {@link android.Manifest.permission#REQUEST_INSTALL_PACKAGES} + * in order to launch the application installer. + * </p> * * @see #EXTRA_INSTALLER_PACKAGE_NAME * @see #EXTRA_NOT_UNKNOWN_SOURCE diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index 96bb2ee..9fb6f4d 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -373,6 +373,12 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { public static final int FLAG_EXTRACT_NATIVE_LIBS = 1<<28; /** + * Value for {@link #flags}: {@code true} when the application's rendering + * should be hardware accelerated. + */ + public static final int FLAG_HARDWARE_ACCELERATED = 1<<29; + + /** * Value for {@link #flags}: true if code from this application will need to be * loaded into other applications' processes. On devices that support multiple * instruction sets, this implies the code might be loaded into a process that's @@ -648,11 +654,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { */ public int installLocation = PackageInfo.INSTALL_LOCATION_UNSPECIFIED; - /** - * True when the application's rendering should be hardware accelerated. - */ - public boolean hardwareAccelerated; - public void dump(Printer pw, String prefix) { super.dumpFront(pw, prefix); if (className != null) { @@ -692,7 +693,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { } pw.println(prefix + "enabled=" + enabled + " targetSdkVersion=" + targetSdkVersion + " versionCode=" + versionCode); - pw.println(prefix + "hardwareAccelerated=" + hardwareAccelerated); if (manageSpaceActivityName != null) { pw.println(prefix + "manageSpaceActivityName="+manageSpaceActivityName); } @@ -784,7 +784,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { descriptionRes = orig.descriptionRes; uiOptions = orig.uiOptions; backupAgentName = orig.backupAgentName; - hardwareAccelerated = orig.hardwareAccelerated; fullBackupContent = orig.fullBackupContent; } @@ -838,7 +837,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { dest.writeString(backupAgentName); dest.writeInt(descriptionRes); dest.writeInt(uiOptions); - dest.writeInt(hardwareAccelerated ? 1 : 0); dest.writeInt(fullBackupContent); } @@ -891,7 +889,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { backupAgentName = source.readString(); descriptionRes = source.readInt(); uiOptions = source.readInt(); - hardwareAccelerated = source.readInt() != 0; fullBackupContent = source.readInt(); } diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 596c0e4..755eb5b 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -2530,7 +2530,9 @@ public class PackageParser { owner.baseHardwareAccelerated = sa.getBoolean( com.android.internal.R.styleable.AndroidManifestApplication_hardwareAccelerated, owner.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.ICE_CREAM_SANDWICH); - ai.hardwareAccelerated = owner.baseHardwareAccelerated; + if (owner.baseHardwareAccelerated) { + ai.flags |= ApplicationInfo.FLAG_HARDWARE_ACCELERATED; + } if (sa.getBoolean( com.android.internal.R.styleable.AndroidManifestApplication_hasCode, diff --git a/core/java/android/hardware/SensorEvent.java b/core/java/android/hardware/SensorEvent.java index 2bc0f9b..906c2a1 100644 --- a/core/java/android/hardware/SensorEvent.java +++ b/core/java/android/hardware/SensorEvent.java @@ -312,7 +312,7 @@ public class SensorEvent { * </p> * * <p> - * values[2]: Roll, rotation around the x-axis (-90 to 90) + * values[2]: Roll, rotation around the y-axis (-90 to 90) * increasing as the device moves clockwise. * </p> * </ul> @@ -325,6 +325,8 @@ public class SensorEvent { * * <p> * <b>Note:</b> This sensor type exists for legacy reasons, please use + * {@link android.hardware.Sensor#TYPE_ROTATION_VECTOR + * rotation vector sensor type} and * {@link android.hardware.SensorManager#getRotationMatrix * getRotationMatrix()} in conjunction with * {@link android.hardware.SensorManager#remapCoordinateSystem diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java index 861969e..fda889f 100644 --- a/core/java/android/hardware/SensorManager.java +++ b/core/java/android/hardware/SensorManager.java @@ -967,8 +967,9 @@ public abstract class SensorManager { * TYPE_MAGNETIC_FIELD}. * * @return <code>true</code> on success, <code>false</code> on failure (for - * instance, if the device is in free fall). On failure the output - * matrices are not modified. + * instance, if the device is in free fall). Free fall is defined as + * condition when the magnitude of the gravity is less than 1/10 of + * the nominal value. On failure the output matrices are not modified. * * @see #getInclination(float[]) * @see #getOrientation(float[], float[]) @@ -981,6 +982,15 @@ public abstract class SensorManager { float Ax = gravity[0]; float Ay = gravity[1]; float Az = gravity[2]; + + final float normsqA = (Ax*Ax + Ay*Ay + Az*Az); + final float g = 9.81f; + final float freeFallGravitySquared = 0.01f * g * g; + if (normsqA < freeFallGravitySquared) { + // gravity less than 10% of normal value + return false; + } + final float Ex = geomagnetic[0]; final float Ey = geomagnetic[1]; final float Ez = geomagnetic[2]; @@ -988,6 +998,7 @@ public abstract class SensorManager { float Hy = Ez*Ax - Ex*Az; float Hz = Ex*Ay - Ey*Ax; final float normH = (float)Math.sqrt(Hx*Hx + Hy*Hy + Hz*Hz); + if (normH < 0.1f) { // device is close to free fall (or in space?), or close to // magnetic north pole. Typical values are > 100. @@ -1117,12 +1128,12 @@ public abstract class SensorManager { * returned by {@link #getRotationMatrix}. * * @param X - * defines on which world axis and direction the X axis of the device - * is mapped. + * defines the axis of the new cooridinate system that coincide with the X axis of the + * original coordinate system. * * @param Y - * defines on which world axis and direction the Y axis of the device - * is mapped. + * defines the axis of the new cooridinate system that coincide with the Y axis of the + * original coordinate system. * * @param outR * the transformed rotation matrix. inR and outR should not be the same @@ -1219,27 +1230,18 @@ public abstract class SensorManager { * <p> * When it returns, the array values is filled with the result: * <ul> - * <li>values[0]: <i>azimuth</i>, rotation around the Z axis.</li> - * <li>values[1]: <i>pitch</i>, rotation around the X axis.</li> + * <li>values[0]: <i>azimuth</i>, rotation around the -Z axis, + * i.e. the opposite direction of Z axis.</li> + * <li>values[1]: <i>pitch</i>, rotation around the -X axis, + * i.e the opposite direction of X axis.</li> * <li>values[2]: <i>roll</i>, rotation around the Y axis.</li> * </ul> - * <p>The reference coordinate-system used is different from the world - * coordinate-system defined for the rotation matrix:</p> - * <ul> - * <li>X is defined as the vector product <b>Y.Z</b> (It is tangential to - * the ground at the device's current location and roughly points West).</li> - * <li>Y is tangential to the ground at the device's current location and - * points towards the magnetic North Pole.</li> - * <li>Z points towards the center of the Earth and is perpendicular to the ground.</li> - * </ul> - * - * <p> - * <center><img src="../../../images/axis_globe_inverted.png" - * alt="Inverted world coordinate-system diagram." border="0" /></center> - * </p> * <p> + * Applying these three intrinsic rotations in azimuth, pitch and roll order transforms + * identity matrix to the rotation matrix given in input R. * All three angles above are in <b>radians</b> and <b>positive</b> in the - * <b>counter-clockwise</b> direction. + * <b>counter-clockwise</b> direction. Range of output is: azimuth from -π to π, + * pitch from -π/2 to π/2 and roll from -π to π. * * @param R * rotation matrix see {@link #getRotationMatrix}. @@ -1275,6 +1277,7 @@ public abstract class SensorManager { values[1] = (float)Math.asin(-R[9]); values[2] = (float)Math.atan2(-R[8], R[10]); } + return values; } @@ -1314,9 +1317,9 @@ public abstract class SensorManager { /** Helper function to compute the angle change between two rotation matrices. * Given a current rotation matrix (R) and a previous rotation matrix - * (prevR) computes the rotation around the z,x, and y axes which + * (prevR) computes the intrinsic rotation around the z, x, and y axes which * transforms prevR to R. - * outputs a 3 element vector containing the z,x, and y angle + * outputs a 3 element vector containing the z, x, and y angle * change at indexes 0, 1, and 2 respectively. * <p> Each input matrix is either as a 3x3 or 4x4 row-major matrix * depending on the length of the passed array: @@ -1333,9 +1336,13 @@ public abstract class SensorManager { * | R[ 8] R[ 9] R[10] R[11] | * \ R[12] R[13] R[14] R[15] / *</pre> + * + * See {@link #getOrientation} for more detailed definition of the output. + * * @param R current rotation matrix * @param prevR previous rotation matrix - * @param angleChange an an array of floats (z, x, and y) in which the angle change is stored + * @param angleChange an an array of floats (z, x, and y) in which the angle change + * (in radians) is stored */ public static void getAngleChange( float[] angleChange, float[] R, float[] prevR) { diff --git a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java index 8776418..2de846c 100644 --- a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java +++ b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java @@ -754,6 +754,7 @@ public class LegacyMetadataMapper { CameraCharacteristics.CONTROL_AE_COMPENSATION_STEP , CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES , CameraCharacteristics.CONTROL_AVAILABLE_EFFECTS , + CameraCharacteristics.CONTROL_AVAILABLE_MODES , CameraCharacteristics.CONTROL_AVAILABLE_SCENE_MODES , CameraCharacteristics.CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES , CameraCharacteristics.CONTROL_AWB_AVAILABLE_MODES , diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 5f515eb..56e919a 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -3282,12 +3282,13 @@ public abstract class BatteryStats implements Parcelable { final long wifiIdleTimeMs = getWifiControllerActivity(CONTROLLER_IDLE_TIME, which); final long wifiRxTimeMs = getWifiControllerActivity(CONTROLLER_RX_TIME, which); final long wifiTxTimeMs = getWifiControllerActivity(CONTROLLER_TX_TIME, which); + final long wifiPowerDrainMaMs = getWifiControllerActivity(CONTROLLER_POWER_DRAIN, which); final long wifiTotalTimeMs = wifiIdleTimeMs + wifiRxTimeMs + wifiTxTimeMs; sb.setLength(0); sb.append(prefix); sb.append(" WiFi Idle time: "); formatTimeMs(sb, wifiIdleTimeMs); - sb.append(" ("); + sb.append("("); sb.append(formatRatioLocked(wifiIdleTimeMs, wifiTotalTimeMs)); sb.append(")"); pw.println(sb.toString()); @@ -3295,7 +3296,7 @@ public abstract class BatteryStats implements Parcelable { sb.setLength(0); sb.append(prefix); sb.append(" WiFi Rx time: "); formatTimeMs(sb, wifiRxTimeMs); - sb.append(" ("); + sb.append("("); sb.append(formatRatioLocked(wifiRxTimeMs, wifiTotalTimeMs)); sb.append(")"); pw.println(sb.toString()); @@ -3303,16 +3304,16 @@ public abstract class BatteryStats implements Parcelable { sb.setLength(0); sb.append(prefix); sb.append(" WiFi Tx time: "); formatTimeMs(sb, wifiTxTimeMs); - sb.append(" ("); + sb.append("("); sb.append(formatRatioLocked(wifiTxTimeMs, wifiTotalTimeMs)); sb.append(")"); pw.println(sb.toString()); sb.setLength(0); sb.append(prefix); - sb.append(" WiFi Power drain: ").append(BatteryStatsHelper.makemAh( - getWifiControllerActivity(CONTROLLER_POWER_DRAIN, which) / (double)(1000*60*60))); - sb.append(" mAh"); + sb.append(" WiFi Power drain: ").append( + BatteryStatsHelper.makemAh(wifiPowerDrainMaMs / (double) (1000*60*60))); + sb.append("mAh"); pw.println(sb.toString()); final long bluetoothIdleTimeMs = @@ -3325,7 +3326,7 @@ public abstract class BatteryStats implements Parcelable { sb.setLength(0); sb.append(prefix); sb.append(" Bluetooth Idle time: "); formatTimeMs(sb, bluetoothIdleTimeMs); - sb.append(" ("); + sb.append("("); sb.append(formatRatioLocked(bluetoothIdleTimeMs, bluetoothTotalTimeMs)); sb.append(")"); pw.println(sb.toString()); @@ -3333,7 +3334,7 @@ public abstract class BatteryStats implements Parcelable { sb.setLength(0); sb.append(prefix); sb.append(" Bluetooth Rx time: "); formatTimeMs(sb, bluetoothRxTimeMs); - sb.append(" ("); + sb.append("("); sb.append(formatRatioLocked(bluetoothRxTimeMs, bluetoothTotalTimeMs)); sb.append(")"); pw.println(sb.toString()); @@ -3341,7 +3342,7 @@ public abstract class BatteryStats implements Parcelable { sb.setLength(0); sb.append(prefix); sb.append(" Bluetooth Tx time: "); formatTimeMs(sb, bluetoothTxTimeMs); - sb.append(" ("); + sb.append("("); sb.append(formatRatioLocked(bluetoothTxTimeMs, bluetoothTotalTimeMs)); sb.append(")"); pw.println(sb.toString()); @@ -3351,7 +3352,7 @@ public abstract class BatteryStats implements Parcelable { sb.append(" Bluetooth Power drain: ").append(BatteryStatsHelper.makemAh( getBluetoothControllerActivity(CONTROLLER_POWER_DRAIN, which) / (double)(1000*60*60))); - sb.append(" mAh"); + sb.append("mAh"); pw.println(sb.toString()); pw.println(); @@ -3656,6 +3657,27 @@ public abstract class BatteryStats implements Parcelable { pw.println(sb.toString()); } + final long uidWifiIdleTimeMs = u.getWifiControllerActivity(CONTROLLER_IDLE_TIME, which); + final long uidWifiRxTimeMs = u.getWifiControllerActivity(CONTROLLER_RX_TIME, which); + final long uidWifiTxTimeMs = u.getWifiControllerActivity(CONTROLLER_TX_TIME, which); + final long uidWifiTotalTimeMs = uidWifiIdleTimeMs + uidWifiRxTimeMs + uidWifiTxTimeMs; + if (uidWifiTotalTimeMs > 0) { + sb.setLength(0); + sb.append(prefix).append(" WiFi Idle time: "); + formatTimeMs(sb, uidWifiIdleTimeMs); + sb.append("(").append(formatRatioLocked(uidWifiIdleTimeMs, uidWifiTotalTimeMs)) + .append(")\n"); + + sb.append(prefix).append(" WiFi Rx time: "); formatTimeMs(sb, uidWifiRxTimeMs); + sb.append("(").append(formatRatioLocked(uidWifiRxTimeMs, uidWifiTotalTimeMs)) + .append(")\n"); + + sb.append(prefix).append(" WiFi Tx time: "); formatTimeMs(sb, uidWifiTxTimeMs); + sb.append("(").append(formatRatioLocked(uidWifiTxTimeMs, uidWifiTotalTimeMs)) + .append(")"); + pw.println(sb.toString()); + } + if (u.hasUserActivity()) { boolean hasData = false; for (int i=0; i<Uid.NUM_USER_ACTIVITY_TYPES; i++) { diff --git a/core/java/android/provider/VoicemailContract.java b/core/java/android/provider/VoicemailContract.java index c6ea50a..e1b5a6d 100644 --- a/core/java/android/provider/VoicemailContract.java +++ b/core/java/android/provider/VoicemailContract.java @@ -19,6 +19,7 @@ package android.provider; import android.Manifest; import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; +import android.content.ComponentName; import android.content.ContentResolver; import android.content.ContentValues; import android.content.Context; @@ -27,6 +28,7 @@ import android.database.ContentObserver; import android.database.Cursor; import android.net.Uri; import android.provider.CallLog.Calls; +import android.telecom.PhoneAccount; import android.telecom.PhoneAccountHandle; import android.telecom.Voicemail; @@ -211,13 +213,17 @@ public class VoicemailContract { // that was encoded into call log databases. /** - * The component name of the account in string form. + * The {@link ComponentName} of the {@link PhoneAccount} in string form. The + * {@link PhoneAccount} of the voicemail is used to differentiate voicemails from different + * sources. * <P>Type: TEXT</P> */ public static final String PHONE_ACCOUNT_COMPONENT_NAME = "subscription_component_name"; /** - * The identifier of a account that is unique to a specified component. + * The identifier of a {@link PhoneAccount} that is unique to a specified + * {@link ComponentName}. The {@link PhoneAccount} of the voicemail is used to differentiate + * voicemails from different sources. * <P>Type: TEXT</P> */ public static final String PHONE_ACCOUNT_ID = "subscription_id"; @@ -340,13 +346,15 @@ public class VoicemailContract { // PHONE_ACCOUNT_* fields. /** - * The component name of the account in string form. + * The {@link ComponentName} of the {@link PhoneAccount} in string form. The + * {@link PhoneAccount} differentiates voicemail sources from the same package. * <P>Type: TEXT</P> */ public static final String PHONE_ACCOUNT_COMPONENT_NAME = "phone_account_component_name"; /** - * The identifier of a account that is unique to a specified component. + * The identifier of a {@link PhoneAccount} that is unique to a specified component. The + * {@link PhoneAccount} differentiates voicemail sources from the same package. * <P>Type: TEXT</P> */ public static final String PHONE_ACCOUNT_ID = "phone_account_id"; diff --git a/core/java/android/service/carrier/CarrierConfigService.java b/core/java/android/service/carrier/CarrierService.java index bf33ad5..15ccc25 100644 --- a/core/java/android/service/carrier/CarrierConfigService.java +++ b/core/java/android/service/carrier/CarrierService.java @@ -20,31 +20,35 @@ import android.os.IBinder; import android.os.PersistableBundle; /** - * A service that sets carrier configuration for telephony services. + * A service that exposes carrier-specific functionality to the system. * <p> * To extend this class, you must declare the service in your manifest file to require the * {@link android.Manifest.permission#BIND_CARRIER_SERVICES} permission and include an intent - * filter with the {@link #SERVICE_INTERFACE} action. For example: + * filter with the {@link #CONFIG_SERVICE_INTERFACE} action if the service exposes carrier config + * and the {@link #BIND_SERVICE_INTERFACE} action if the service should have a long-lived binding. + * For example: * </p> * * <pre>{@code - * <service android:name=".MyCarrierConfigService" + * <service android:name=".MyCarrierService" * android:label="@string/service_name" * android:permission="android.permission.BIND_CARRIER_SERVICES"> * <intent-filter> - * <action android:name="android.service.carrier.CarrierConfigService" /> + * <action android:name="android.service.carrier.ConfigService" /> + * <action android:name="android.service.carrier.BindService" /> * </intent-filter> * </service> * }</pre> */ -public abstract class CarrierConfigService extends Service { +public abstract class CarrierService extends Service { - public static final String SERVICE_INTERFACE = "android.service.carrier.CarrierConfigService"; + public static final String CONFIG_SERVICE_INTERFACE = "android.service.carrier.ConfigService"; + public static final String BIND_SERVICE_INTERFACE = "android.service.carrier.BindService"; - private final ICarrierConfigService.Stub mStubWrapper; + private final ICarrierService.Stub mStubWrapper; - public CarrierConfigService() { - mStubWrapper = new ICarrierConfigServiceWrapper(); + public CarrierService() { + mStubWrapper = new ICarrierServiceWrapper(); } /** @@ -82,23 +86,24 @@ public abstract class CarrierConfigService extends Service { /** @hide */ @Override public final IBinder onBind(Intent intent) { - if (!SERVICE_INTERFACE.equals(intent.getAction())) { + if (!CONFIG_SERVICE_INTERFACE.equals(intent.getAction()) + || !BIND_SERVICE_INTERFACE.equals(intent.getAction())) { return null; } return mStubWrapper; } /** - * A wrapper around ICarrierConfigService that forwards calls to implementations of - * {@link CarrierConfigService}. + * A wrapper around ICarrierService that forwards calls to implementations of + * {@link CarrierService}. * * @hide */ - private class ICarrierConfigServiceWrapper extends ICarrierConfigService.Stub { + private class ICarrierServiceWrapper extends ICarrierService.Stub { @Override public PersistableBundle getCarrierConfig(CarrierIdentifier id) { - return CarrierConfigService.this.onLoadConfig(id); + return CarrierService.this.onLoadConfig(id); } } } diff --git a/core/java/android/service/carrier/ICarrierConfigService.aidl b/core/java/android/service/carrier/ICarrierService.aidl index abbc000..4c87585 100644 --- a/core/java/android/service/carrier/ICarrierConfigService.aidl +++ b/core/java/android/service/carrier/ICarrierService.aidl @@ -20,13 +20,13 @@ import android.os.PersistableBundle; import android.service.carrier.CarrierIdentifier; /** - * Service used to get carrier config from carrier apps. + * Service used to expose carrier-specific functionality to the system. * - * @see android.service.carrier.CarrierConfigService + * @see android.service.carrier.CarrierService * @hide */ -interface ICarrierConfigService { +interface ICarrierService { - /** @see android.service.carrier.CarrierConfigService#onLoadConfig */ + /** @see android.service.carrier.CarrierService#onLoadConfig */ PersistableBundle getCarrierConfig(in CarrierIdentifier id); } diff --git a/core/java/android/service/gatekeeper/GateKeeperResponse.aidl b/core/java/android/service/gatekeeper/GateKeeperResponse.aidl new file mode 100644 index 0000000..966606e --- /dev/null +++ b/core/java/android/service/gatekeeper/GateKeeperResponse.aidl @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2015 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 android.service.gatekeeper; + +/** + * Response object for a GateKeeper verification request. + * @hide + */ +parcelable GateKeeperResponse; + diff --git a/core/java/android/service/gatekeeper/GateKeeperResponse.java b/core/java/android/service/gatekeeper/GateKeeperResponse.java new file mode 100644 index 0000000..a512957 --- /dev/null +++ b/core/java/android/service/gatekeeper/GateKeeperResponse.java @@ -0,0 +1,120 @@ +/* + * Copyright (C) 2015 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 android.service.gatekeeper; + +import android.os.Parcel; +import android.os.Parcelable; + +/** + * Response object for a GateKeeper verification request. + * @hide + */ +public final class GateKeeperResponse implements Parcelable { + + public static final int RESPONSE_ERROR = -1; + public static final int RESPONSE_OK = 0; + public static final int RESPONSE_RETRY = 1; + + private final int mResponseCode; + + private int mTimeout; + private byte[] mPayload; + private boolean mShouldReEnroll; + + private GateKeeperResponse(int responseCode) { + mResponseCode = responseCode; + } + + private GateKeeperResponse(int responseCode, int timeout) { + mResponseCode = responseCode; + } + + @Override + public int describeContents() { + return 0; + } + + public static final Parcelable.Creator<GateKeeperResponse> CREATOR + = new Parcelable.Creator<GateKeeperResponse>() { + @Override + public GateKeeperResponse createFromParcel(Parcel source) { + int responseCode = source.readInt(); + GateKeeperResponse response = new GateKeeperResponse(responseCode); + if (responseCode == RESPONSE_RETRY) { + response.setTimeout(source.readInt()); + } else if (responseCode == RESPONSE_OK) { + response.setShouldReEnroll(source.readInt() == 1); + int size = source.readInt(); + if (size > 0) { + byte[] payload = new byte[size]; + source.readByteArray(payload); + response.setPayload(payload); + } + } + return response; + } + + @Override + public GateKeeperResponse[] newArray(int size) { + return new GateKeeperResponse[size]; + } + + }; + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(mResponseCode); + if (mResponseCode == RESPONSE_RETRY) { + dest.writeInt(mTimeout); + } else if (mResponseCode == RESPONSE_OK) { + dest.writeInt(mShouldReEnroll ? 1 : 0); + if (mPayload != null) { + dest.writeInt(mPayload.length); + dest.writeByteArray(mPayload); + } + } + } + + public byte[] getPayload() { + return mPayload; + } + + public int getTimeout() { + return mTimeout; + } + + public boolean getShouldReEnroll() { + return mShouldReEnroll; + } + + public int getResponseCode() { + return mResponseCode; + } + + private void setTimeout(int timeout) { + mTimeout = timeout; + } + + private void setShouldReEnroll(boolean shouldReEnroll) { + mShouldReEnroll = shouldReEnroll; + } + + private void setPayload(byte[] payload) { + mPayload = payload; + } + +} diff --git a/core/java/android/service/gatekeeper/IGateKeeperService.aidl b/core/java/android/service/gatekeeper/IGateKeeperService.aidl index 4f46701..6db2110 100644 --- a/core/java/android/service/gatekeeper/IGateKeeperService.aidl +++ b/core/java/android/service/gatekeeper/IGateKeeperService.aidl @@ -16,6 +16,8 @@ package android.service.gatekeeper; +import android.service.gatekeeper.GateKeeperResponse; + /** * Interface for communication with GateKeeper, the * secure password storage daemon. @@ -34,9 +36,9 @@ interface IGateKeeperService { * If provided, must verify against the currentPasswordHandle. * @param desiredPassword The new desired password, for which a handle will be returned * upon success. - * @return the handle corresponding to desiredPassword, or null + * @return an EnrollResponse or null on failure */ - byte[] enroll(int uid, in byte[] currentPasswordHandle, in byte[] currentPassword, + GateKeeperResponse enroll(int uid, in byte[] currentPasswordHandle, in byte[] currentPassword, in byte[] desiredPassword); /** @@ -45,10 +47,10 @@ interface IGateKeeperService { * @param enrolledPasswordHandle The handle against which the provided password will be * verified. * @param The plaintext blob to verify against enrolledPassword. - * @return True if the authentication was successful + * @return a VerifyResponse, or null on failure. */ - boolean verify(int uid, in byte[] enrolledPasswordHandle, - in byte[] providedPassword); + GateKeeperResponse verify(int uid, in byte[] enrolledPasswordHandle, in byte[] providedPassword); + /** * Verifies an enrolled handle against a provided, plaintext blob. * @param uid The Android user ID associated to this enrollment @@ -58,9 +60,9 @@ interface IGateKeeperService { * @param enrolledPasswordHandle The handle against which the provided password will be * verified. * @param The plaintext blob to verify against enrolledPassword. - * @return an opaque attestation of authentication on success, or null. + * @return a VerifyResponse with an attestation, or null on failure. */ - byte[] verifyChallenge(int uid, long challenge, in byte[] enrolledPasswordHandle, + GateKeeperResponse verifyChallenge(int uid, long challenge, in byte[] enrolledPasswordHandle, in byte[] providedPassword); /** diff --git a/core/java/android/service/notification/ZenModeConfig.java b/core/java/android/service/notification/ZenModeConfig.java index dd3cedc..1da46d0 100644 --- a/core/java/android/service/notification/ZenModeConfig.java +++ b/core/java/android/service/notification/ZenModeConfig.java @@ -79,6 +79,7 @@ public class ZenModeConfig implements Parcelable { private static final int XML_VERSION = 2; private static final String ZEN_TAG = "zen"; private static final String ZEN_ATT_VERSION = "version"; + private static final String ZEN_ATT_USER = "user"; private static final String ALLOW_TAG = "allow"; private static final String ALLOW_ATT_CALLS = "calls"; private static final String ALLOW_ATT_REPEAT_CALLERS = "repeatCallers"; @@ -117,6 +118,7 @@ public class ZenModeConfig implements Parcelable { public boolean allowEvents = DEFAULT_ALLOW_EVENTS; public int allowCallsFrom = DEFAULT_SOURCE; public int allowMessagesFrom = DEFAULT_SOURCE; + public int user = UserHandle.USER_OWNER; public ZenRule manualRule; public ArrayMap<String, ZenRule> automaticRules = new ArrayMap<>(); @@ -131,6 +133,7 @@ public class ZenModeConfig implements Parcelable { allowEvents = source.readInt() == 1; allowCallsFrom = source.readInt(); allowMessagesFrom = source.readInt(); + user = source.readInt(); manualRule = source.readParcelable(null); final int len = source.readInt(); if (len > 0) { @@ -153,6 +156,7 @@ public class ZenModeConfig implements Parcelable { dest.writeInt(allowEvents ? 1 : 0); dest.writeInt(allowCallsFrom); dest.writeInt(allowMessagesFrom); + dest.writeInt(user); dest.writeParcelable(manualRule, 0); if (!automaticRules.isEmpty()) { final int len = automaticRules.size(); @@ -173,7 +177,8 @@ public class ZenModeConfig implements Parcelable { @Override public String toString() { return new StringBuilder(ZenModeConfig.class.getSimpleName()).append('[') - .append("allowCalls=").append(allowCalls) + .append("user=").append(user) + .append(",allowCalls=").append(allowCalls) .append(",allowRepeatCallers=").append(allowRepeatCallers) .append(",allowMessages=").append(allowMessages) .append(",allowCallsFrom=").append(sourceToString(allowCallsFrom)) @@ -185,6 +190,68 @@ public class ZenModeConfig implements Parcelable { .append(']').toString(); } + private Diff diff(ZenModeConfig to) { + final Diff d = new Diff(); + if (to == null) { + return d.addLine("config", "delete"); + } + if (user != to.user) { + d.addLine("user", user, to.user); + } + if (allowCalls != to.allowCalls) { + d.addLine("allowCalls", allowCalls, to.allowCalls); + } + if (allowRepeatCallers != to.allowRepeatCallers) { + d.addLine("allowRepeatCallers", allowRepeatCallers, to.allowRepeatCallers); + } + if (allowMessages != to.allowMessages) { + d.addLine("allowMessages", allowMessages, to.allowMessages); + } + if (allowCallsFrom != to.allowCallsFrom) { + d.addLine("allowCallsFrom", allowCallsFrom, to.allowCallsFrom); + } + if (allowMessagesFrom != to.allowMessagesFrom) { + d.addLine("allowMessagesFrom", allowMessagesFrom, to.allowMessagesFrom); + } + if (allowReminders != to.allowReminders) { + d.addLine("allowReminders", allowReminders, to.allowReminders); + } + if (allowEvents != to.allowEvents) { + d.addLine("allowEvents", allowEvents, to.allowEvents); + } + final ArraySet<String> allRules = new ArraySet<>(); + addKeys(allRules, automaticRules); + addKeys(allRules, to.automaticRules); + final int N = allRules.size(); + for (int i = 0; i < N; i++) { + final String rule = allRules.valueAt(i); + final ZenRule fromRule = automaticRules != null ? automaticRules.get(rule) : null; + final ZenRule toRule = to.automaticRules != null ? to.automaticRules.get(rule) : null; + ZenRule.appendDiff(d, "automaticRule[" + rule + "]", fromRule, toRule); + } + ZenRule.appendDiff(d, "manualRule", manualRule, to.manualRule); + return d; + } + + public static Diff diff(ZenModeConfig from, ZenModeConfig to) { + if (from == null) { + final Diff d = new Diff(); + if (to != null) { + d.addLine("config", "insert"); + } + return d; + } + return from.diff(to); + } + + private static <T> void addKeys(ArraySet<T> set, ArrayMap<T, ?> map) { + if (map != null) { + for (int i = 0; i < map.size(); i++) { + set.add(map.keyAt(i)); + } + } + } + public boolean isValid() { if (!isValidManualRule(manualRule)) return false; final int N = automaticRules.size(); @@ -249,6 +316,7 @@ public class ZenModeConfig implements Parcelable { && other.allowMessagesFrom == allowMessagesFrom && other.allowReminders == allowReminders && other.allowEvents == allowEvents + && other.user == user && Objects.equals(other.automaticRules, automaticRules) && Objects.equals(other.manualRule, manualRule); } @@ -256,7 +324,7 @@ public class ZenModeConfig implements Parcelable { @Override public int hashCode() { return Objects.hash(allowCalls, allowRepeatCallers, allowMessages, allowCallsFrom, - allowMessagesFrom, allowReminders, allowEvents, automaticRules, manualRule); + allowMessagesFrom, allowReminders, allowEvents, user, automaticRules, manualRule); } private static String toDayList(int[] days) { @@ -312,6 +380,7 @@ public class ZenModeConfig implements Parcelable { final XmlV1 v1 = XmlV1.readXml(parser); return migration.migrate(v1); } + rt.user = safeInt(parser, ZEN_ATT_USER, rt.user); while ((type = parser.next()) != XmlPullParser.END_DOCUMENT) { tag = parser.getName(); if (type == XmlPullParser.END_TAG && ZEN_TAG.equals(tag)) { @@ -357,6 +426,7 @@ public class ZenModeConfig implements Parcelable { public void writeXml(XmlSerializer out) throws IOException { out.startTag(null, ZEN_TAG); out.attribute(null, ZEN_ATT_VERSION, Integer.toString(XML_VERSION)); + out.attribute(null, ZEN_ATT_USER, Integer.toString(user)); out.startTag(null, ALLOW_TAG); out.attribute(null, ALLOW_ATT_CALLS, Boolean.toString(allowCalls)); @@ -915,6 +985,45 @@ public class ZenModeConfig implements Parcelable { .append(']').toString(); } + private static void appendDiff(Diff d, String item, ZenRule from, ZenRule to) { + if (d == null) return; + if (from == null) { + if (to != null) { + d.addLine(item, "insert"); + } + return; + } + from.appendDiff(d, item, to); + } + + private void appendDiff(Diff d, String item, ZenRule to) { + if (to == null) { + d.addLine(item, "delete"); + return; + } + if (enabled != to.enabled) { + d.addLine(item, "enabled", enabled, to.enabled); + } + if (snoozing != to.snoozing) { + d.addLine(item, "snoozing", snoozing, to.snoozing); + } + if (!Objects.equals(name, to.name)) { + d.addLine(item, "name", name, to.name); + } + if (zenMode != to.zenMode) { + d.addLine(item, "zenMode", zenMode, to.zenMode); + } + if (!Objects.equals(conditionId, to.conditionId)) { + d.addLine(item, "conditionId", conditionId, to.conditionId); + } + if (!Objects.equals(condition, to.condition)) { + d.addLine(item, "condition", condition, to.condition); + } + if (!Objects.equals(component, to.component)) { + d.addLine(item, "component", component, to.component); + } + } + @Override public boolean equals(Object o) { if (!(o instanceof ZenRule)) return false; @@ -1073,4 +1182,34 @@ public class ZenModeConfig implements Parcelable { ZenModeConfig migrate(XmlV1 v1); } + public static class Diff { + private final ArrayList<String> lines = new ArrayList<>(); + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("Diff["); + final int N = lines.size(); + for (int i = 0; i < N; i++) { + if (i > 0) { + sb.append(','); + } + sb.append(lines.get(i)); + } + return sb.append(']').toString(); + } + + private Diff addLine(String item, String action) { + lines.add(item + ":" + action); + return this; + } + + public Diff addLine(String item, String subitem, Object from, Object to) { + return addLine(item + "." + subitem, from, to); + } + + public Diff addLine(String item, Object from, Object to) { + return addLine(item, from + "->" + to); + } + } + } diff --git a/core/java/android/view/WindowManagerGlobal.java b/core/java/android/view/WindowManagerGlobal.java index c16578e..606168c 100644 --- a/core/java/android/view/WindowManagerGlobal.java +++ b/core/java/android/view/WindowManagerGlobal.java @@ -20,6 +20,7 @@ import android.animation.ValueAnimator; import android.app.ActivityManager; import android.content.ComponentCallbacks2; import android.content.Context; +import android.content.pm.ApplicationInfo; import android.content.res.Configuration; import android.os.IBinder; import android.os.RemoteException; @@ -247,7 +248,8 @@ public final class WindowManagerGlobal { // set from the application's hardware acceleration setting. final Context context = view.getContext(); if (context != null - && context.getApplicationInfo().hardwareAccelerated) { + && (context.getApplicationInfo().flags + & ApplicationInfo.FLAG_HARDWARE_ACCELERATED) != 0) { wparams.flags |= WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED; } } diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index fc84cf9..6cd35f9 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -1890,6 +1890,11 @@ public class Editor { if (!extractedTextModeWillBeStarted()) { if (isCursorInsideEasyCorrectionSpan()) { + // Cancel the single tap delayed runnable. + if (mSelectionModeWithoutSelectionRunnable != null) { + mTextView.removeCallbacks(mSelectionModeWithoutSelectionRunnable); + } + mShowSuggestionRunnable = new Runnable() { public void run() { showSuggestions(); @@ -3819,13 +3824,15 @@ public class Editor { SystemClock.uptimeMillis() - TextView.sLastCutCopyOrTextChangedTime; // Cancel the single tap delayed runnable. - if (mDoubleTap && mSelectionModeWithoutSelectionRunnable != null) { + if (mSelectionModeWithoutSelectionRunnable != null + && (mDoubleTap || isCursorInsideEasyCorrectionSpan())) { mTextView.removeCallbacks(mSelectionModeWithoutSelectionRunnable); } // Prepare and schedule the single tap runnable to run exactly after the double tap // timeout has passed. - if (!mDoubleTap && (durationSinceCutOrCopy < RECENT_CUT_COPY_DURATION)) { + if (!mDoubleTap && !isCursorInsideEasyCorrectionSpan() + && (durationSinceCutOrCopy < RECENT_CUT_COPY_DURATION)) { if (mSelectionModeWithoutSelectionRunnable == null) { mSelectionModeWithoutSelectionRunnable = new Runnable() { public void run() { diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java index 2709f25..ca57d1a 100644 --- a/core/java/android/widget/ScrollView.java +++ b/core/java/android/widget/ScrollView.java @@ -1704,12 +1704,26 @@ public class ScrollView extends FrameLayout { super.draw(canvas); if (mEdgeGlowTop != null) { final int scrollY = mScrollY; + final boolean clipToPadding = getClipToPadding(); if (!mEdgeGlowTop.isFinished()) { final int restoreCount = canvas.save(); - final int width = getWidth() - mPaddingLeft - mPaddingRight; - - canvas.translate(mPaddingLeft, Math.min(0, scrollY)); - mEdgeGlowTop.setSize(width, getHeight()); + final int width; + final int height; + final float translateX; + final float translateY; + if (clipToPadding) { + width = getWidth() - mPaddingLeft - mPaddingRight; + height = getHeight() - mPaddingTop - mPaddingBottom; + translateX = mPaddingLeft; + translateY = mPaddingTop; + } else { + width = getWidth(); + height = getHeight(); + translateX = 0; + translateY = 0; + } + canvas.translate(translateX, Math.min(0, scrollY) + translateY); + mEdgeGlowTop.setSize(width, height); if (mEdgeGlowTop.draw(canvas)) { postInvalidateOnAnimation(); } @@ -1717,11 +1731,23 @@ public class ScrollView extends FrameLayout { } if (!mEdgeGlowBottom.isFinished()) { final int restoreCount = canvas.save(); - final int width = getWidth() - mPaddingLeft - mPaddingRight; - final int height = getHeight(); - - canvas.translate(-width + mPaddingLeft, - Math.max(getScrollRange(), scrollY) + height); + final int width; + final int height; + final float translateX; + final float translateY; + if (clipToPadding) { + width = getWidth() - mPaddingLeft - mPaddingRight; + height = getHeight() - mPaddingTop - mPaddingBottom; + translateX = mPaddingLeft; + translateY = mPaddingTop; + } else { + width = getWidth(); + height = getHeight(); + translateX = 0; + translateY = 0; + } + canvas.translate(-width + translateX, + Math.max(getScrollRange(), scrollY) + height + translateY); canvas.rotate(180, width, 0); mEdgeGlowBottom.setSize(width, height); if (mEdgeGlowBottom.draw(canvas)) { diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index a93e7ef..9de7778 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -8015,8 +8015,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * through a thunk. */ void sendAfterTextChanged(Editable text) { - sLastCutCopyOrTextChangedTime = 0; - if (mListeners != null) { final ArrayList<TextWatcher> list = mListeners; final int count = list.size(); @@ -8049,6 +8047,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * through a thunk. */ void handleTextChanged(CharSequence buffer, int start, int before, int after) { + sLastCutCopyOrTextChangedTime = 0; + final Editor.InputMethodState ims = mEditor == null ? null : mEditor.mInputMethodState; if (ims == null || ims.mBatchEditNesting == 0) { updateAfterEdit(); diff --git a/core/java/com/android/internal/widget/ILockSettings.aidl b/core/java/com/android/internal/widget/ILockSettings.aidl index bfafff6..dfb7c50 100644 --- a/core/java/com/android/internal/widget/ILockSettings.aidl +++ b/core/java/com/android/internal/widget/ILockSettings.aidl @@ -16,6 +16,8 @@ package com.android.internal.widget; +import com.android.internal.widget.VerifyCredentialResponse; + /** {@hide} */ interface ILockSettings { void setBoolean(in String key, in boolean value, in int userId); @@ -25,11 +27,11 @@ interface ILockSettings { long getLong(in String key, in long defaultValue, in int userId); String getString(in String key, in String defaultValue, in int userId); void setLockPattern(in String pattern, in String savedPattern, int userId); - boolean checkPattern(in String pattern, int userId); - byte[] verifyPattern(in String pattern, long challenge, int userId); + VerifyCredentialResponse checkPattern(in String pattern, int userId); + VerifyCredentialResponse verifyPattern(in String pattern, long challenge, int userId); void setLockPassword(in String password, in String savedPassword, int userId); - boolean checkPassword(in String password, int userId); - byte[] verifyPassword(in String password, long challenge, int userId); + VerifyCredentialResponse checkPassword(in String password, int userId); + VerifyCredentialResponse verifyPassword(in String password, long challenge, int userId); boolean checkVoldPassword(int userId); boolean havePattern(int userId); boolean havePassword(int userId); diff --git a/core/java/com/android/internal/widget/LockPatternChecker.java b/core/java/com/android/internal/widget/LockPatternChecker.java index ac0f5fe..4880664 100644 --- a/core/java/com/android/internal/widget/LockPatternChecker.java +++ b/core/java/com/android/internal/widget/LockPatternChecker.java @@ -2,6 +2,8 @@ package com.android.internal.widget; import android.os.AsyncTask; +import com.android.internal.widget.LockPatternUtils.RequestThrottledException; + import java.util.List; /** @@ -16,8 +18,10 @@ public final class LockPatternChecker { * Invoked when a security check is finished. * * @param matched Whether the PIN/Password/Pattern matches the stored one. + * @param throttleTimeoutMs The amount of time in ms to wait before reattempting + * the call. Only non-0 if matched is false. */ - void onChecked(boolean matched); + void onChecked(boolean matched, int throttleTimeoutMs); } /** @@ -28,8 +32,10 @@ public final class LockPatternChecker { * Invoked when a security verification is finished. * * @param attestation The attestation that the challenge was verified, or null. + * @param throttleTimeoutMs The amount of time in ms to wait before reattempting + * the call. Only non-0 if attestation is null. */ - void onVerified(byte[] attestation); + void onVerified(byte[] attestation, int throttleTimeoutMs); } /** @@ -47,14 +53,21 @@ public final class LockPatternChecker { final int userId, final OnVerifyCallback callback) { AsyncTask<Void, Void, byte[]> task = new AsyncTask<Void, Void, byte[]>() { + private int mThrottleTimeout; + @Override protected byte[] doInBackground(Void... args) { - return utils.verifyPattern(pattern, challenge, userId); + try { + return utils.verifyPattern(pattern, challenge, userId); + } catch (RequestThrottledException ex) { + mThrottleTimeout = ex.getTimeoutMs(); + return null; + } } @Override protected void onPostExecute(byte[] result) { - callback.onVerified(result); + callback.onVerified(result, mThrottleTimeout); } }; task.execute(); @@ -74,14 +87,21 @@ public final class LockPatternChecker { final int userId, final OnCheckCallback callback) { AsyncTask<Void, Void, Boolean> task = new AsyncTask<Void, Void, Boolean>() { + private int mThrottleTimeout; + @Override protected Boolean doInBackground(Void... args) { - return utils.checkPattern(pattern, userId); + try { + return utils.checkPattern(pattern, userId); + } catch (RequestThrottledException ex) { + mThrottleTimeout = ex.getTimeoutMs(); + return false; + } } @Override protected void onPostExecute(Boolean result) { - callback.onChecked(result); + callback.onChecked(result, mThrottleTimeout); } }; task.execute(); @@ -103,14 +123,21 @@ public final class LockPatternChecker { final int userId, final OnVerifyCallback callback) { AsyncTask<Void, Void, byte[]> task = new AsyncTask<Void, Void, byte[]>() { + private int mThrottleTimeout; + @Override protected byte[] doInBackground(Void... args) { - return utils.verifyPassword(password, challenge, userId); + try { + return utils.verifyPassword(password, challenge, userId); + } catch (RequestThrottledException ex) { + mThrottleTimeout = ex.getTimeoutMs(); + return null; + } } @Override protected void onPostExecute(byte[] result) { - callback.onVerified(result); + callback.onVerified(result, mThrottleTimeout); } }; task.execute(); @@ -130,14 +157,21 @@ public final class LockPatternChecker { final int userId, final OnCheckCallback callback) { AsyncTask<Void, Void, Boolean> task = new AsyncTask<Void, Void, Boolean>() { + private int mThrottleTimeout; + @Override protected Boolean doInBackground(Void... args) { - return utils.checkPassword(password, userId); + try { + return utils.checkPassword(password, userId); + } catch (RequestThrottledException ex) { + mThrottleTimeout = ex.getTimeoutMs(); + return false; + } } @Override protected void onPostExecute(Boolean result) { - callback.onChecked(result); + callback.onChecked(result, mThrottleTimeout); } }; task.execute(); diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index 55b058c..aee0ff6 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -60,24 +60,12 @@ public class LockPatternUtils { private static final boolean DEBUG = false; /** - * The maximum number of incorrect attempts before the user is prevented - * from trying again for {@link #FAILED_ATTEMPT_TIMEOUT_MS}. - */ - public static final int FAILED_ATTEMPTS_BEFORE_TIMEOUT = 5; - - /** * The number of incorrect attempts before which we fall back on an alternative * method of verifying the user, and resetting their lock pattern. */ public static final int FAILED_ATTEMPTS_BEFORE_RESET = 20; /** - * How long the user is prevented from trying again after entering the - * wrong pattern too many times. - */ - public static final long FAILED_ATTEMPT_TIMEOUT_MS = 30000L; - - /** * The interval of the countdown for showing progress of the lockout. */ public static final long FAILED_ATTEMPT_COUNTDOWN_INTERVAL_MS = 1000L; @@ -109,6 +97,7 @@ public class LockPatternUtils { @Deprecated public final static String LOCKOUT_PERMANENT_KEY = "lockscreen.lockedoutpermanently"; public final static String LOCKOUT_ATTEMPT_DEADLINE = "lockscreen.lockoutattemptdeadline"; + public final static String LOCKOUT_ATTEMPT_TIMEOUT_MS = "lockscreen.lockoutattempttimeoutmss"; public final static String PATTERN_EVER_CHOSEN_KEY = "lockscreen.patterneverchosen"; public final static String PASSWORD_TYPE_KEY = "lockscreen.password_type"; @Deprecated @@ -144,6 +133,23 @@ public class LockPatternUtils { private DevicePolicyManager mDevicePolicyManager; private ILockSettings mLockSettingsService; + + public static final class RequestThrottledException extends Exception { + private int mTimeoutMs; + public RequestThrottledException(int timeoutMs) { + mTimeoutMs = timeoutMs; + } + + /** + * @return The amount of time in ms before another request may + * be executed + */ + public int getTimeoutMs() { + return mTimeoutMs; + } + + } + public DevicePolicyManager getDevicePolicyManager() { if (mDevicePolicyManager == null) { mDevicePolicyManager = @@ -239,9 +245,23 @@ public class LockPatternUtils { * @param challenge The challenge to verify against the pattern * @return the attestation that the challenge was verified, or null. */ - public byte[] verifyPattern(List<LockPatternView.Cell> pattern, long challenge, int userId) { + public byte[] verifyPattern(List<LockPatternView.Cell> pattern, long challenge, int userId) + throws RequestThrottledException { try { - return getLockSettings().verifyPattern(patternToString(pattern), challenge, userId); + VerifyCredentialResponse response = + getLockSettings().verifyPattern(patternToString(pattern), challenge, userId); + if (response == null) { + // Shouldn't happen + return null; + } + + if (response.getResponseCode() == VerifyCredentialResponse.RESPONSE_OK) { + return response.getPayload(); + } else if (response.getResponseCode() == VerifyCredentialResponse.RESPONSE_RETRY) { + throw new RequestThrottledException(response.getTimeout()); + } else { + return null; + } } catch (RemoteException re) { return null; } @@ -253,9 +273,19 @@ public class LockPatternUtils { * @param pattern The pattern to check. * @return Whether the pattern matches the stored one. */ - public boolean checkPattern(List<LockPatternView.Cell> pattern, int userId) { + public boolean checkPattern(List<LockPatternView.Cell> pattern, int userId) + throws RequestThrottledException { try { - return getLockSettings().checkPattern(patternToString(pattern), userId); + VerifyCredentialResponse response = + getLockSettings().checkPattern(patternToString(pattern), userId); + + if (response.getResponseCode() == VerifyCredentialResponse.RESPONSE_OK) { + return true; + } else if (response.getResponseCode() == VerifyCredentialResponse.RESPONSE_RETRY) { + throw new RequestThrottledException(response.getTimeout()); + } else { + return false; + } } catch (RemoteException re) { return true; } @@ -270,9 +300,19 @@ public class LockPatternUtils { * @param challenge The challenge to verify against the password * @return the attestation that the challenge was verified, or null. */ - public byte[] verifyPassword(String password, long challenge, int userId) { + public byte[] verifyPassword(String password, long challenge, int userId) + throws RequestThrottledException { try { - return getLockSettings().verifyPassword(password, challenge, userId); + VerifyCredentialResponse response = + getLockSettings().verifyPassword(password, challenge, userId); + + if (response.getResponseCode() == VerifyCredentialResponse.RESPONSE_OK) { + return response.getPayload(); + } else if (response.getResponseCode() == VerifyCredentialResponse.RESPONSE_RETRY) { + throw new RequestThrottledException(response.getTimeout()); + } else { + return null; + } } catch (RemoteException re) { return null; } @@ -284,9 +324,17 @@ public class LockPatternUtils { * @param password The password to check. * @return Whether the password matches the stored one. */ - public boolean checkPassword(String password, int userId) { + public boolean checkPassword(String password, int userId) throws RequestThrottledException { try { - return getLockSettings().checkPassword(password, userId); + VerifyCredentialResponse response = + getLockSettings().checkPassword(password, userId); + if (response.getResponseCode() == VerifyCredentialResponse.RESPONSE_OK) { + return true; + } else if (response.getResponseCode() == VerifyCredentialResponse.RESPONSE_RETRY) { + throw new RequestThrottledException(response.getTimeout()); + } else { + return false; + } } catch (RemoteException re) { return true; } @@ -992,9 +1040,10 @@ public class LockPatternUtils { * pattern until the deadline has passed. * @return the chosen deadline. */ - public long setLockoutAttemptDeadline(int userId) { - final long deadline = SystemClock.elapsedRealtime() + FAILED_ATTEMPT_TIMEOUT_MS; + public long setLockoutAttemptDeadline(int userId, int timeoutMs) { + final long deadline = SystemClock.elapsedRealtime() + timeoutMs; setLong(LOCKOUT_ATTEMPT_DEADLINE, deadline, userId); + setLong(LOCKOUT_ATTEMPT_TIMEOUT_MS, timeoutMs, userId); return deadline; } @@ -1005,8 +1054,9 @@ public class LockPatternUtils { */ public long getLockoutAttemptDeadline(int userId) { final long deadline = getLong(LOCKOUT_ATTEMPT_DEADLINE, 0L, userId); + final long timeoutMs = getLong(LOCKOUT_ATTEMPT_TIMEOUT_MS, 0L, userId); final long now = SystemClock.elapsedRealtime(); - if (deadline < now || deadline > (now + FAILED_ATTEMPT_TIMEOUT_MS)) { + if (deadline < now || deadline > (now + timeoutMs)) { return 0L; } return deadline; diff --git a/core/java/com/android/internal/widget/VerifyCredentialResponse.aidl b/core/java/com/android/internal/widget/VerifyCredentialResponse.aidl new file mode 100644 index 0000000..59a4bba --- /dev/null +++ b/core/java/com/android/internal/widget/VerifyCredentialResponse.aidl @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2015 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.internal.widget; + +/** + * Response object for an ILockSettings verification request. + * @hide + */ +parcelable VerifyCredentialResponse; + diff --git a/core/java/com/android/internal/widget/VerifyCredentialResponse.java b/core/java/com/android/internal/widget/VerifyCredentialResponse.java new file mode 100644 index 0000000..48109ca --- /dev/null +++ b/core/java/com/android/internal/widget/VerifyCredentialResponse.java @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2015 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.internal.widget; + +import android.os.Parcel; +import android.os.Parcelable; + +/** + * Response object for a ILockSettings credential verification request. + * @hide + */ +public final class VerifyCredentialResponse implements Parcelable { + + public static final int RESPONSE_ERROR = -1; + public static final int RESPONSE_OK = 0; + public static final int RESPONSE_RETRY = 1; + + public static final VerifyCredentialResponse OK = new VerifyCredentialResponse(); + public static final VerifyCredentialResponse ERROR + = new VerifyCredentialResponse(RESPONSE_ERROR, 0, null); + + private int mResponseCode; + private byte[] mPayload; + private int mTimeout; + + public static final Parcelable.Creator<VerifyCredentialResponse> CREATOR + = new Parcelable.Creator<VerifyCredentialResponse>() { + @Override + public VerifyCredentialResponse createFromParcel(Parcel source) { + int responseCode = source.readInt(); + VerifyCredentialResponse response = new VerifyCredentialResponse(responseCode, 0, null); + if (responseCode == RESPONSE_RETRY) { + response.setTimeout(source.readInt()); + } else if (responseCode == RESPONSE_OK) { + int size = source.readInt(); + if (size > 0) { + byte[] payload = new byte[size]; + source.readByteArray(payload); + response.setPayload(payload); + } + } + return response; + } + + @Override + public VerifyCredentialResponse[] newArray(int size) { + return new VerifyCredentialResponse[size]; + } + + }; + + public VerifyCredentialResponse() { + mResponseCode = RESPONSE_OK; + mPayload = null; + } + + + public VerifyCredentialResponse(byte[] payload) { + mPayload = payload; + mResponseCode = RESPONSE_OK; + } + + public VerifyCredentialResponse(int timeout) { + mTimeout = timeout; + mResponseCode = RESPONSE_RETRY; + mPayload = null; + } + + private VerifyCredentialResponse(int responseCode, int timeout, byte[] payload) { + mResponseCode = responseCode; + mTimeout = timeout; + mPayload = payload; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(mResponseCode); + if (mResponseCode == RESPONSE_RETRY) { + dest.writeInt(mTimeout); + } else if (mResponseCode == RESPONSE_OK) { + if (mPayload != null) { + dest.writeInt(mPayload.length); + dest.writeByteArray(mPayload); + } + } + } + + @Override + public int describeContents() { + return 0; + } + + public byte[] getPayload() { + return mPayload; + } + + public int getTimeout() { + return mTimeout; + } + + public int getResponseCode() { + return mResponseCode; + } + + private void setTimeout(int timeout) { + mTimeout = timeout; + } + + private void setPayload(byte[] payload) { + mPayload = payload; + } +} diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp index 04b9a95..832f92f 100755 --- a/core/jni/android/graphics/Bitmap.cpp +++ b/core/jni/android/graphics/Bitmap.cpp @@ -46,8 +46,8 @@ public: SkSafeUnref(mColorTable); } - void reconfigure(const SkImageInfo& info, size_t rowBytes, SkColorTable* ctable) { - if (kIndex_8_SkColorType != info.colorType()) { + void reconfigure(const SkImageInfo& newInfo, size_t rowBytes, SkColorTable* ctable) { + if (kIndex_8_SkColorType != newInfo.colorType()) { ctable = nullptr; } mRowBytes = rowBytes; @@ -56,13 +56,22 @@ public: mColorTable = ctable; SkSafeRef(mColorTable); } + + // Need to validate the alpha type to filter against the color type + // to prevent things like a non-opaque RGB565 bitmap + SkAlphaType alphaType; + LOG_ALWAYS_FATAL_IF(!SkColorTypeValidateAlphaType( + newInfo.colorType(), newInfo.alphaType(), &alphaType), + "Failed to validate alpha type!"); + // Dirty hack is dirty // TODO: Figure something out here, Skia's current design makes this // really hard to work with. Skia really, really wants immutable objects, // but with the nested-ref-count hackery going on that's just not // feasible without going insane trying to figure it out SkImageInfo* myInfo = const_cast<SkImageInfo*>(&this->info()); - *myInfo = info; + *myInfo = newInfo; + changeAlphaType(alphaType); // Docs say to only call this in the ctor, but we're going to call // it anyway even if this isn't always the ctor. @@ -254,6 +263,14 @@ void Bitmap::reconfigure(const SkImageInfo& info) { reconfigure(info, info.minRowBytes(), nullptr); } +void Bitmap::setAlphaType(SkAlphaType alphaType) { + if (!SkColorTypeValidateAlphaType(info().colorType(), alphaType, &alphaType)) { + return; + } + + mPixelRef->changeAlphaType(alphaType); +} + void Bitmap::detachFromJava() { bool disposeSelf; { @@ -861,10 +878,10 @@ static void Bitmap_setHasAlpha(JNIEnv* env, jobject, jlong bitmapHandle, jboolean hasAlpha, jboolean requestPremul) { LocalScopedBitmap bitmap(bitmapHandle); if (hasAlpha) { - bitmap->peekAtPixelRef()->changeAlphaType( + bitmap->setAlphaType( requestPremul ? kPremul_SkAlphaType : kUnpremul_SkAlphaType); } else { - bitmap->peekAtPixelRef()->changeAlphaType(kOpaque_SkAlphaType); + bitmap->setAlphaType(kOpaque_SkAlphaType); } } @@ -873,9 +890,9 @@ static void Bitmap_setPremultiplied(JNIEnv* env, jobject, jlong bitmapHandle, LocalScopedBitmap bitmap(bitmapHandle); if (!bitmap->info().isOpaque()) { if (isPremul) { - bitmap->peekAtPixelRef()->changeAlphaType(kPremul_SkAlphaType); + bitmap->setAlphaType(kPremul_SkAlphaType); } else { - bitmap->peekAtPixelRef()->changeAlphaType(kUnpremul_SkAlphaType); + bitmap->setAlphaType(kUnpremul_SkAlphaType); } } } diff --git a/core/jni/android/graphics/Bitmap.h b/core/jni/android/graphics/Bitmap.h index 95b5fae..eadba5c 100644 --- a/core/jni/android/graphics/Bitmap.h +++ b/core/jni/android/graphics/Bitmap.h @@ -71,6 +71,7 @@ public: void reconfigure(const SkImageInfo& info, size_t rowBytes, SkColorTable* ctable); void reconfigure(const SkImageInfo& info); + void setAlphaType(SkAlphaType alphaType); void getSkBitmap(SkBitmap* outBitmap); void detachFromJava(); diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp index 5928c69..6c2bbd4 100644 --- a/core/jni/android_media_AudioRecord.cpp +++ b/core/jni/android_media_AudioRecord.cpp @@ -321,6 +321,7 @@ native_init_failure: delete lpCallbackData; env->SetLongField(thiz, javaAudioRecordFields.nativeCallbackCookie, 0); + // lpRecorder goes out of scope, so reference count drops to zero return (jint) AUDIORECORD_ERROR_SETUP_NATIVEINITFAILED; } diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp index 5b52a49..5faa150 100644 --- a/core/jni/android_media_AudioTrack.cpp +++ b/core/jni/android_media_AudioTrack.cpp @@ -405,6 +405,7 @@ native_init_failure: delete lpJniStorage; env->SetLongField(thiz, javaAudioTrackFields.jniData, 0); + // lpTrack goes out of scope, so reference count drops to zero return (jint) AUDIOTRACK_ERROR_SETUP_NATIVEINITFAILED; } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 4f451c7..1b77bfb 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -349,14 +349,14 @@ android:description="@string/permdesc_writeContacts" android:protectionLevel="dangerous" /> - <!-- Allows an application to read the user's personal profile data. --> + <!-- @deprecated No longer enforced. This was last enforced in API version 22. --> <permission android:name="android.permission.READ_PROFILE" android:permissionGroup="android.permission-group.CONTACTS" android:label="@string/permlab_readProfile" android:description="@string/permdesc_readProfile" android:protectionLevel="dangerous" /> - <!-- Allows an application to write the user's personal profile data. --> + <!-- @deprecated No longer enforced. This was last enforced in API version 22. --> <permission android:name="android.permission.WRITE_PROFILE" android:permissionGroup="android.permission-group.CONTACTS" android:label="@string/permlab_writeProfile" @@ -1475,7 +1475,6 @@ android:label="@string/permlab_readSyncStats" android:protectionLevel="normal" /> - <!-- ============================================ --> <!-- Permissions for low-level system interaction --> <!-- ============================================ --> @@ -1933,6 +1932,14 @@ <permission android:name="android.permission.SET_KEYBOARD_LAYOUT" android:protectionLevel="signature" /> + <!-- Allows an application to request installing packages. Apps + targeting APIs greater than 22 must hold this permission in + order to use {@link android.content.Intent#ACTION_INSTALL_PACKAGE}.--> + <permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" + android:label="@string/permlab_requestInstallPackages" + android:description="@string/permdesc_requestInstallPackages" + android:protectionLevel="normal" /> + <!-- @SystemApi Allows an application to install packages. <p>Not for use by third-party applications. --> <permission android:name="android.permission.INSTALL_PACKAGES" @@ -2451,7 +2458,7 @@ <!-- Allows applications to act as network scorers. @hide @SystemApi--> <permission android:name="android.permission.LOCAL_MAC_ADDRESS" - android:protectionLevel="signature" /> + android:protectionLevel="signatureOrSystem" /> <!-- The system process is explicitly the only one allowed to launch the confirmation UI for full backup/restore --> diff --git a/core/res/res/drawable-hdpi/dialog_background_mtrl_mult.9.png b/core/res/res/drawable-hdpi/dialog_background_mtrl_mult.9.png Binary files differdeleted file mode 100644 index 0c3c3b4..0000000 --- a/core/res/res/drawable-hdpi/dialog_background_mtrl_mult.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/dialog_background_mtrl_mult.9.png b/core/res/res/drawable-mdpi/dialog_background_mtrl_mult.9.png Binary files differdeleted file mode 100644 index 8322ae3..0000000 --- a/core/res/res/drawable-mdpi/dialog_background_mtrl_mult.9.png +++ /dev/null diff --git a/core/res/res/drawable-xhdpi/dialog_background_mtrl_mult.9.png b/core/res/res/drawable-xhdpi/dialog_background_mtrl_mult.9.png Binary files differdeleted file mode 100644 index e6c0047..0000000 --- a/core/res/res/drawable-xhdpi/dialog_background_mtrl_mult.9.png +++ /dev/null diff --git a/core/res/res/drawable-xxhdpi/dialog_background_mtrl_mult.9.png b/core/res/res/drawable-xxhdpi/dialog_background_mtrl_mult.9.png Binary files differdeleted file mode 100644 index bb9debb..0000000 --- a/core/res/res/drawable-xxhdpi/dialog_background_mtrl_mult.9.png +++ /dev/null diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml index 5bc0e03..d5c2d19 100644 --- a/core/res/res/values/arrays.xml +++ b/core/res/res/values/arrays.xml @@ -231,8 +231,6 @@ <item>@drawable/ic_voice_search_api_holo_light</item> <item>@drawable/dialog_bottom_holo_dark</item> <item>@drawable/dialog_bottom_holo_light</item> - <item>@drawable/dialog_full_holo_dark</item> - <item>@drawable/dialog_full_holo_light</item> <item>@drawable/dialog_middle_holo_dark</item> <item>@drawable/dialog_middle_holo_light</item> <item>@drawable/dialog_top_holo_dark</item> @@ -263,13 +261,9 @@ <item>@drawable/fastscroll_track_holo_dark</item> <item>@drawable/fastscroll_track_pressed_holo_dark</item> <item>@drawable/fastscroll_track_default_holo_dark</item> - <item>@drawable/fastscroll_label_left_holo_dark</item> - <item>@drawable/fastscroll_label_right_holo_dark</item> <item>@drawable/fastscroll_track_holo_light</item> <item>@drawable/fastscroll_track_pressed_holo_light</item> <item>@drawable/fastscroll_track_default_holo_light</item> - <item>@drawable/fastscroll_label_left_holo_light</item> - <item>@drawable/fastscroll_label_right_holo_light</item> <item>@drawable/editbox_dropdown_background_dark</item> <item>@drawable/textfield_searchview_holo_dark</item> <item>@drawable/textfield_searchview_right_holo_dark</item> @@ -310,7 +304,6 @@ <item>@drawable/cab_background_bottom_material</item> <item>@drawable/cab_background_top_material</item> <item>@drawable/dialog_background_material</item> - <item>@drawable/dialog_background_shadow_material</item> <item>@drawable/edit_text_material</item> <item>@drawable/expander_group_material</item> <item>@drawable/fastscroll_label_left_material</item> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 74d448c..1a76264 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -3044,6 +3044,11 @@ <!-- Description of an application permission that lets it read install sessions. --> <string name="permdesc_readInstallSessions">Allows an application to read install sessions. This allows it to see details about active package installations.</string> + <!-- Title of an application permission that lets it read install sessions. --> + <string name="permlab_requestInstallPackages">Request install packages</string> + <!-- Description of an application permission that lets it read install sessions. --> + <string name="permdesc_requestInstallPackages">Allows an application to request installation of packages.</string> + <!-- Shown in the tutorial for tap twice for zoom control. --> <string name="tutorial_double_tap_to_zoom_message_short">Touch twice for zoom control</string> diff --git a/core/res/res/values/themes_micro.xml b/core/res/res/values/themes_micro.xml index 112afa6..8bf635e 100644 --- a/core/res/res/values/themes_micro.xml +++ b/core/res/res/values/themes_micro.xml @@ -14,7 +14,7 @@ limitations under the License. --> <resources> - <style name="Theme.Micro" parent="Theme.Material.NoActionBar"> + <style name="Theme.MicroBase" parent="Theme.Material.NoActionBar"> <item name="alertDialogTheme">@style/Theme.Micro.Dialog.Alert</item> <item name="alertDialogStyle">@style/AlertDialog.Micro</item> <item name="dialogTheme">@style/Theme.Micro.Dialog</item> @@ -29,7 +29,10 @@ <item name="windowOverscan">true</item> </style> - <style name="Theme.Micro.Light" parent="Theme.Material.Light.NoActionBar"> + <style name="Theme.Micro" parent="Theme.MicroBase"> + </style> + + <style name="Theme.Micro.LightBase" parent="Theme.Material.Light.NoActionBar"> <item name="alertDialogTheme">@style/Theme.Micro.Dialog.Alert</item> <item name="alertDialogStyle">@style/AlertDialog.Micro</item> <item name="dialogTheme">@style/Theme.Micro.Dialog</item> @@ -44,7 +47,11 @@ <item name="windowOverscan">true</item> </style> - <style name="Theme.Micro.Dialog" parent="Theme.Material.Light.Dialog"> + <!-- Indirection needed for overlays to make sure there is a common base parent --> + <style name="Theme.Micro.Light" parent="Theme.Micro.LightBase"> + </style> + + <style name="Theme.Micro.DialogBase" parent="Theme.Material.Light.Dialog"> <item name="windowTitleStyle">@android:style/DialogWindowTitle.Micro</item> <item name="windowIsFloating">false</item> <item name="windowFullscreen">true</item> @@ -54,6 +61,10 @@ <item name="windowOverscan">true</item> </style> + <!-- Indirection needed for overlays to make sure there is a common base parent --> + <style name="Theme.Micro.Dialog" parent="Theme.Micro.DialogBase"> + </style> + <style name="Theme.Micro.Dialog.Alert"> <item name="windowTitleStyle">@style/DialogWindowTitle.Micro</item> <item name="alertDialogStyle">@style/AlertDialog.Micro</item> diff --git a/docs/html-ndk/ndk/downloads/downloads_toc.cs b/docs/html-ndk/ndk/downloads/downloads_toc.cs index fca91bc..dbe8aec 100644 --- a/docs/html-ndk/ndk/downloads/downloads_toc.cs +++ b/docs/html-ndk/ndk/downloads/downloads_toc.cs @@ -6,12 +6,16 @@ localized titles are added in the language order specified below. ?> - <ul id="nav"> - <li class="nav-section"> - <div class="nav-section-header empty"><a href="/ndk/downloads/index.html"><span class="en"> - NDK Download</span></a> - </li> + <li class="nav-section"> + <div class="nav-section-header empty"><a href="/ndk/downloads/index.html"><span class="en"> + Downloads</span></a></div> + </li> + + <li class="nav-section"> + <div class="nav-section-header empty"><a href="/ndk/downloads/revision_history.html"> + <span class="en">Revision History</span></a></div> + </li> </ul> diff --git a/docs/html-ndk/ndk/downloads/index.jd b/docs/html-ndk/ndk/downloads/index.jd index fdbc083..94e9ae9 100644 --- a/docs/html-ndk/ndk/downloads/index.jd +++ b/docs/html-ndk/ndk/downloads/index.jd @@ -323,26 +323,59 @@ injunctive remedies (or an equivalent type of urgent legal relief) in any jurisd </div> <div id="qv-wrapper"> - <div id="qv"> - <h2>In this document</h2> - - <ol> - <li><a href="#Downloads">Downloads</a></li> - <li><a href="#rel">Release Notes</a></li> - </ol> - </div> + </div> - <p>Select, from the table below, the NDK package suitable for your development platform.</p> + <p>Select, from the table below, the NDK package for your development platform. For information + about the changes in the newest version of the NDK, see <a href="#rel">Release Notes</a>. For + information about earlier revisions, see <a href="{@docRoot}ndk/downloads/revision_history.html"> + NDK Revision History.</a></p> -<h2 id="Downloads">Downloads</h2> +<h2 id="Downloads">Downloading</h2> <script> $('#Downloads').after($('#download-table')); </script> + <h2 id="extract">Extraction</h2> + <p>The NDK package is a self-extracting binary. To unpack it, follow the procedure for your + development platform:</p> + <ul> + <li>On Linux and Mac OS X (Darwin): + <ul> + <ol> + <li>Download the appropriate package from this page.</li> + <li>Open a terminal window.</li> + <li>Go to the directory to which you downloaded the package.</li> + <li>Run <code>chmod a+x</code> on the downloaded package.</li> + <li>Execute the package. For example: + <pre class="no-pretty-print"> +ndk$ chmod a+x android-ndk-r10c-darwin-x86_64.bin +ndk$ ./android-ndk-r10c-darwin-x86_64.bin + </pre></li> + <p>The folder containing the NDK extracts itself.</p> + <p>You can also use a program like 7z to extract the package.</p> + </ol> + </ul> + </li> + <li>On Windows:</li> + <ul> + <ol> + <li>Download the appropriate package from this page.</li> + <li>Navigate to the folder to which you downloaded the package.</li> + <li>Double-click the downloaded file. The folder containing the NDK extracts itself.</li> + </ol> + </ul> + </ul>When uncompressed, the NDK files are contained in a directory called + <code>android-ndk-<version></code>. You can rename the NDK directory if necessary and you + can move it to any location on your computer. This documentation refers to the NDK directory as + <code><ndk></code>. + + + <p>You are now ready to start working with the NDK.</p> + <h2 id="rel">Release Notes</h2> <p>Android NDK, Revision 10e</a> <em>(May 2015)</em></p> diff --git a/docs/html-ndk/ndk/downloads/revision_history.jd b/docs/html-ndk/ndk/downloads/revision_history.jd new file mode 100644 index 0000000..a32b814 --- /dev/null +++ b/docs/html-ndk/ndk/downloads/revision_history.jd @@ -0,0 +1,3237 @@ +page.title=NDK Revision History +@jd:body + +<p>This page provides information on previous releases of the NDK, enumerating the changes that +took place in each new version.</p> + +<div class="toggle-content closed"> +<a name="10d"></a> + <p> + <a href="#" onclick="return toggleContent(this)"> <img + src="/assets/images/triangle-closed.png" class="toggle-content-img" alt="" + >Android NDK, Revision 10d</a> <em>(December 2014)</em> + </p> + <div class="toggle-content-toggleme"> + <dl> + <dt>Important changes:</dt> + <dd> + <ul> + <li>Made GCC 4.8 the default for all 32-bit ABIs. Deprecated GCC 4.6, and + will remove it next release. To restore previous behavior, either add + <code>NDK_TOOLCHAIN_VERSION=4.6</code> to ndk-build, or + add <code>--toolchain=arm-linux-androideabi-4.6</code> when executing + <code>make-standalone-toolchain.sh</code> on the command line. GCC 4.9 remains the + default for 64-bit ABIs.</li> + + <li>Stopped all x86[_64] toolchains from adding <code>-mstackrealign</code> by default. The + NDK toolchain assumes a 16-byte stack alignment. The tools and options used by default + enforce this rule. A user writing assembly code must make sure to preserve stack + alignment, and ensure that other compilers also comply with this rule. + (GCC bug <a href="https://gcc.gnu.org/bugzilla/show_bug.cgi?id=38496">38496</a>)</li> + + <li>Added Address Sanitizer functionality to Clang 3.5 support to the ARM and x86 ABIs. + For more information on this change, see the + <a href="https://code.google.com/p/address-sanitizer/wiki/Android">Address + Sanitizer</a> project.</li> + + <li>Introduced the requirement, starting from API level 21, to use <code>-fPIE -pie + </code> when building. In API levels 16 and higher, ndk-build uses <code>PIE</code> + when building. This change has a number of implications, which are discussed in + <a href="https://code.google.com/p/android-developer-preview/issues/detail?id=888"> + Developer Preview Issue 888</a>. + These implications do not apply to shared libraries.</li> + </ul> + </dd> + <dl> + + + <dt>Important bug fixes:</dt> + <dd> + <ul> + <li>Made more fixes related to + <a href="https://gcc.gnu.org/ml/gcc-patches/2014-10/msg00906.html"> + A53 Errata #835769</a> in the aarch64-linux-android-4.9 linker. As part of this, GCC + passes a new option, <code>--fix-cortex-a53-835769</code>, when + <code>-mfix-cortex-a53-835769</code> (enabled by default) is specified. + For more information, see this + <a href="https://sourceware.org/ml/binutils/2014-10/msg00198.html">binutils message</a> + and this + <a href="https://sourceware.org/ml/binutils/2014-11/msg00287.html">binutils message</a>. + </li> + + <li>Documented a fix to a libc++ <code>sscanf/vsscanf</code> hang that occurred in API level + 21. The fix itself had been implemented in r10c. + (Issue <a href="http://b.android.com/77988">77988</a>)</li> + + <li>Fixed an AutoFDO (<code>-fauto-profile</code>) crash that occurred with GCC 4.9 when + <code>-Os</code> was specified. (Issue <a href="http://b.android.com/77571">77571</a>)</li> + </ul> + </dd> + + + <dt>Other bug fixes:</dt> + <dd> + <ul> + <li>Made the following header and library fixes:</li> + <ul> + <li>Added <code>posix_memalign</code> to API level 16. Also, added a prototype in + <code>stdlib.h</code> to API levels 16 to 19. + (Issue <a href="http://b.android.com/77861">77861</a>)</li> + <li>Fixed <code>stdatomic.h</code> so that it includes <code><atomic></code> only for + C++11.</li> + <li>Modified the following headers for standalone use: <code>sys/user.h</code>, and + <code>gl2ext.h</code>, <code>dlext.h</code>, <code>fts.h</code>, <code>sgidefs.h</code> + for API level 21.</li> + <li>Modified <code>sys/user.h</code> to rename <code>mxcsr_mask</code> as <code>mxcr_mask</code>, + and to change the data type for <code>u_ar0</code></li> from <code>unsigned long</code> + to </code>struct user_regs_struct*</code>. + <li>Changed <code>sysconf()</code> return value type from <code>int</code> to + <code>long</code>.</li> + </ul> + + <li>Fixed ndk-build's handling of <code>thumb</code> for <code>LOCAL_ARM_MODE</code>: In + r10d, ndk-build adds <code>LOCAL_LDFLAGS+=-mthumb</code> by default, unless one of the + following conditions applies:</li> + <ul> + <li>You have set <code>LOCAL_ARM_MODE</code> equal to <code>arm</code>.</li> + <li>You are doing a debug build (with settings such as <code>APP_OPTIM=debug</code> and + <code>AndroidManifest.xml</code> containing <code>android:debuggable="true"</code>), + where ARM mode is the default in order to retain compatibility with earlier toolchains. + (Issue <a href="http://b.android.com/74040">74040</a>)</li> + </ul> + + <li>Fixed <code>LOCAL_SRC_FILES</code> in ndk-build to use Windows absolute paths. + (Issue <a href="http://b.android.com/74333">74333</a>)</li> + + <li>Removed bash-specific code from ndk-gdb. (Issue <a href="http://b.android.com/73338">73338</a>)</li> + + <li>Removed bash-specific code from <code>make-standalone-toolchain.sh</code>. + (Issue <a href="http://b.android.com/74145">74145)</a></li> + + <li>Revised documentation concerning a fix for <code>System.loadLibrary()</code> transitive + dependencies. (Issue <a href="http://b.android.com/41790">41790</a>)</li> + + <li>Fixed a problem that was preventing 64-bit packages from extracting on Ubuntu 14.04 and + OS X 10.10 (Yosemite). (Issue <a href="http://b.android.com/78148">78148</a>)</li> + + <li>Fixed an issue with <code>LOCAL_PCH</code> to improve Clang support. (Issue + <a href="http://b.android.com/77575">77575</a>)</li> + + <li>Clarified "requires executable stack" warning from ld.gold. (Issue + <a href="http://b.android.com/79115">79115</a>)</li> + </ul> + </dd> + + </dl> + </div> +</div> + + + + + + + +<div class="toggle-content closed"> +<a name="10c"></a> + <p> + <a href="#" onclick="return toggleContent(this)"> <img + src="/assets/images/triangle-closed.png" class="toggle-content-img" alt="" + >Android NDK, Revision 10c</a> <em>(October 2014)</em> + </p> + <div class="toggle-content-toggleme"> + <dl> + <dt>Important changes:</dt> + <dd> + <ul> + <li>Made the following changes to download structure:</li> + <ul> + <li>Each package now contains both the 32- and the 64-bit headers, libraries, and tools for + its respective platform.</li> + <li>STL libraries with debugging info no longer need be downloaded separately.</li> + </ul> + <li>Changed everything previously called <code>Android-L</code> to the official release + designation: <code>android-21</code>.</li> + <li>Updated GCC 4.9 by rebasing to the <code>google</code> branch + of the GCC repository. Major differences from the upstream version of GCC 4.9 include:</li> + + <ul> + <li>The <code>-O2</code> option now turns on vectorization, without loop peeling but with more + aggressive unrolling.</li> + <li>Enhancements to FDO and <a href="https://gcc.gnu.org/wiki/LightweightIpo#LIPO_-_Profile_Feedback_Based_Lightweight_IPO"> + LIPO</a></li> + <p>For more detailed information, see <em>Important bug fixes</em> below.</p> + </ul> + + <li>Added Clang 3.5 support to all hosts: <code>NDK_TOOLCHAIN_VERSION=clang</code> + now picks Clang 3.5. Note that:</li> + <ul> + + <li>ARM and x86 default to using the integrated assembler. If this causes issues, use + <code>-fno-integrated-as</code> as a workaround.</code> + <li>Clang 3.5 issues more warnings for unused flags, such as the <code>-finline-functions</code> + option that GCC supports.</li> + <p>When migrating from projects using GCC, you can use + <code>-Wno-invalid-command-line-argument</code> and <code>-Wno-unused-command-line-argument</code> + to ignore the unused flags until you're able decide on what to do with them longer-term.</p> + + </ul> + <li>Made it possible to enter ART debugging mode, when debugging on an Android 5.0 device using + ART as its virtual machine, by specifying the <code>art-on</code> option. For more information, + see <code>prebuilt/common/gdb/common.setup</code> in the directory containing the NDK.</li> + <li>Removed support for Clang 3.3.</li> + <li>Deprecated GCC 4.6, and may remove it from future releases.</li> + <li>Updated mclinker to 2.8 with Identical Code Folding ("ICF") support. Specify ICF using the + <code>--icf</code> option.</li> + <li>Broadened <code>arm_neon.h</code> support in x86 and x86_64, attaining coverage of ~93% of + NEON intrinsics. For more information about NEON support: + <ul> + <li>Navigate to the NDK Programmer's Guide (<code>docs/Programmers_Guide/html/</code>), and see + Architectures and CPUs > Neon.</li> + <li>Examine the updated <code>hello-neon</code> sample in <code>samples/</code>. + <li>See Intel's guide to <a href="https://software.intel.com/en-us/blogs/2012/12/12/from-arm-neon-to-intel-mmxsse-automatic-porting-solution-tips-and-tricks"> porting from ARM NEON to Intel SSE.</a></li> + </ul> + <li>Documented support for <code>_FORTIFY_SOURCE</code> in <code>headers/libs/android-21</code>, + which appeared in r10 (when <code>android-21</code> was still called <code>Android-L</code>), + but had no documentation.</li> + </ul> + </dd> + <dl> + + + <dt>Important bug fixes:</dt> + <dd> + <ul> + <li>Fixed an internal compiler error with GCC4.9/aarch64 that was causing the following + error message (Issue <a href="http://b.android.com/77564">77564</a>):</li> +<pre> +internal compiler error: in simplify_const_unary_operation, at simplify-rtx.c:1539 +</pre> + <li>Fixed incorrect code generation from GCC4.9/arm. (Issue + <a href="http://b.android.com/77567">77567<a>)</li> + <li>Fixed an internal compiler error with GCC4.9/mips involving inline-assembly. (Issue + <a href="http://b.android.com/77568">77568</a>)</li> + <li>Fixed incorrect code that GCC4.9/arm was generating for <code>x = (cond) ? y : x</code>. + (Issue <a href="http://b.android.com/77569">77569</a>)</li> + <li>Fixed GCC4.9/aarch64 and Clang3.5/aarch64 to work around the + <a href="http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20141006/116322.html"> + Cortex-A53 erratum (835769)</a> by default. Disable the workaround by specifying + <code>-mno-fix-cortex-a53-835769</code>.</li> + </ul> + </dd> + + + <dt>Other bug fixes:</dt> + <dd> + <ul> + <li>Made the following header and library fixes to <code>android-21</code>: + <ul> + + <li>Added more TV keycodes: <code>android/keycodes.h</code></li> + <li>Added more constants and six new sensor functions to <code>android/sensor.h</code>: + <code>ASensorManager_getDefaultSensorEx</code>, <code>ASensor_getFifoMaxEventCount</code>, + <code>ASensor_getFifoReservedEventCount</code>, <code>ASensor_getStringType</code>, + <code>ASensor_getReportingMode</code>, and <code>ASensor_isWakeUpSensor</code>.</li> + <li>Fixed <code>stdatomic.h</code> to improve compatibility with GCC 4.6, and provide support + for the <code><atomic></code> header.</li> + <li>Added <code>sys/ucontext.h</code> and <code>sys/user.h</code> to all API levels. The + <code>signal.h</code> header now includes <code><sys/ucontext.h></code>. You may + remove any existing definition of <code>struct ucontext</code>.</li> + <li>Added <code>posix_memalign</code> to API levels 17, 18, and 19.</li> + <li>Added the following functions to all architectures: + <code>android_set_abort_message</code>, <code>posix_fadvise</code>, + <code>posix_fadvise64</code>, <code>pthread_gettid_np</code>.</li> + <li>Added the required permissions to the <code>native-media/AndroidManifest.xml</code> + sample. + (Issue <a href="https://android-review.googlesource.com/#/c/106640/">106640</a>)</li> + <li>Added <code>clock_nanosleep</code> and <code>clock_settime</code> to API level 21. (Issue + <a href="http://b.android.com/77372">77372</a>) + <li>Removed the following symbols from all architectures: + <code>get_malloc_leak_info</code>, <code>free_malloc_leak_info</code>, + <code>__srget</code>, <code>__swbuf</code>, <code>__srefill</code>, <code>__swsetup</code>, + <code>__sdidinit</code>, <code>__sflags</code>, <code>__sfp</code>, + <code>__sinit</code>, <code>__smakebuf</code>, <code>__sflush</code>, <code>__sread</code>, + <code>__swrite</code>, <code>__sseek</code>, <code>__sclose</code>, + <code>_fwalk</code>, <code>__sglue</code>, <code>__get_thread</code>, <code>__wait4</code>, + <code>__futex_wake</code>, <code>__open</code>, <code>__get_tls</code>, + <code>__getdents64</code>, and <code>dlmalloc</code>.</li> + <li>Removed the following functions from the 64-bit architectures: <code>basename_r</code>, + <code>dirname_r</code>, <code>__isthreaded</code>, <code>_flush_cache</code> (mips64).</li> + <li>Removed the following function from the 32-bit architectures: + <code>__signalfd4</code>.</li> + <li>Changed the type of the third argument from <code>size_t</code> to <code>int</code> in + the following functions: <code>strtoll_l</code>, <code>strtoull_l</code>, + <code>wcstoll_l</code>, and <code>wcstoull_l</code>.</li> + <li>Restored the following functions to the 64-bit architecture: <code>arc4random</code>, + <code>arc4random_buf</code>, and <code>arc4random_uniform</code>.</li> + <li>Moved <code>cxa_*</code> and the <code>new</code> and <code>delete</code> operators back + to <code>libstdc++.so</code>. This change restores r9d behavior; previous versions of r10 + contained dummy files.</li> + + </ul> + <li>Restored MXU support in GCC 4.8 and 4.9 for mips. This support had been absent from + r10 and r10b because those versions of GCC had been compiled with binutils-2.24, which did + not support MXU. It now does.</li> + <li>Fixed <code>--toolchain=</code> in <code>make-standalone-toolchain.sh</code> so that it + now properly supports use of a suffix specifying a version of Clang.</li> + <li>Fixed the libc++/armeabi <code>strtod()</code> functions.</li> + <li>Made fixes to NDK documentation in <code>docs/</code>.</li> + </ul> + </dd> + + <dt>Other changes:</dt> + <dd> + <ul> + <li>Enhanced <code>cpu-features</code> to detect ARMv8 support for the following + instruction sets: AES, CRC32, SHA2, SHA1, and 64-bit PMULL/PMULL2. (Issue + <a href="https://android-review.googlesource.com/#/c/106360/">106360</a>)</li> + + <li>Modified ndk-build to use <code>*-gcc-ar</code>, which is available in GCC 4.8, GCC 4.9, and + Clang. Clang specifies it, instead of <code>*-ar</code>. This setting brings improved LTO + support.</li> + + <li>Removed the <code>include-fixed/linux/a.out.h</code> and + <code>include-fixed/linux/compiler.h</code> headers from the GCC compiler. + (Issue <a href ="http://b.android.com/73728">73728</a>)</li> + + <li>Fixed an issue related to <code>-flto</code> with GCC 4.8 on Mac OS X. The error message + read:</li> + + <pre> +.../ld: error: .../libexec/gcc/arm-linux-androideabi/4.9/liblto_plugin.so +Symbol not found: _environ +</pre> + + <li>Fixed a typo in <code>build-binary.mk.</code> (Issue + <a href="http://b.android.com/76992">76992</a>)</li> + </ul> + </dd> + + <dt>Important known issues:</dt> + <dd> + <ul> + <li>Specifying -Os (<code>-fauto-profile</code>) in GCC4.9 may cause crashing. + (Issue <a href="http://b.android.com/77571">77571</a>)</li> + </ul> + </dd> + + </dl> + </div> +</div> + +<div class="toggle-content closed"> +<a name="10b"></a> + <p> + <a href="#" onclick="return toggleContent(this)"> <img + src="/assets/images/triangle-closed.png" class="toggle-content-img" alt="" + >Android NDK, Revision 10b</a> <em>(September 2014)</em> + </p> + <div class="toggle-content-toggleme"> + <dl> + + <dt>Important notes:</dt> + <dd> + <ul> + <li>Because of the 512MB size restriction on downloadable packages, the following 32-bit items are not in the 32-bit NDK download packages. Instead, they reside in the 64-bit ones:</li> + <ul> + <li>Android-L headers</li> + <li>GCC 4.9</li> + </ul> + <li>Currently, the only Renderscript support provided by the NDK is for 32-bit Renderscript with Android 4.4 (API level 19). You cannot build HelloComputeNDK (the only Renderscript sample) with any other combination of Renderscript (32- or 64-bit) and Android version.</li> + <li>To compile native-codec, you must use a 64-bit NDK package, which is where all the Android-L headers are located. </li> + </ul> + </dd> + + + <dt>Important bug fixes:</dt> + <dd> + <ul> + <li>Fixed gdb 7.6 in GCC 4.8/4.9. (Issues <a href="http://b.android.com/74112">74112</a> and <a href="http://b.android.com/74371">74371</a>.)</li> + <li>Fixed GCC 4.8/4.9 for x86, so that they no longer enable <code>-msse4.2</code> and <code>-mpopcnt</code> by default. (Issue <a href="http://b.android.com/73843">73843</a>.)</li> + </ul> + </dd> + + <dt>Other bug fixes:</dt> + <dd> + <ul> + <li>Removed <code>stdio.h</code> from the <code>include-fixed/</code> directories of all versions of GCC. (Issue <a href="http://b.android.com/73728">73728</a>.)</li> + <li>Removed duplicate header files from the Windows packages in the <code>platforms/android-L/arch-*/usr/include/linux/netfilter*/</code> directories. (Issue <a href="https://code.google.com/p/android/issues/detail?id=73704">73704</a>.)</li> + <li>Fixed a problem that prevented Clang from building HelloComputeNDK.</li> + <li>Fixed atexit. (Issue <a href="http://b.android.com/66595">66595</a>.)</li> + <li>Made various fixes to the docs in <code>docs/</code> and <code>sources/third_party/googletest/README.NDK</code>. (Issue <a href="http://b.android.com/74069">74069</a>.)</li> + <li>Made the following fixes to the Android-L headers:</li> + <ol> + <li>Added the following functions to <code>ctype.h</code> and <code>wchar.h</code>: <code>dn_expand()</code>, <code>grantpt()</code>, <code> inet_nsap_addr()</code>, <code>inet_nsap_ntoa()</code>, <code>insque()</code>, <code>nsdispatch()</code>, <code>posix_openpt()</code>, <code>__pthread_cleanup_pop()</code>, <code>__pthread_cleanup_push()</code>, <code>remque()</code>, <code>setfsgid()</code>, <code>setfsuid()</code>, <code>splice()</code>, <code>tee()</code>, <code>twalk()</code> (Issue <a href = "http://b.android.com/73719">73719</a>), and 42 <code>*_l()</code> functions.</li> + + <li>Renamed <code>cmsg_nxthdr</code> to <code>__cmsg_nxthdr</code>.</li> + + <li>Removed <code>__libc_malloc_dispatch</code>.</li> + + <li>Changed the <code>ptrace()</code> prototype to <code>long ptrace(int, ...);</code>.</li> + + <li>Removed <code>sha1.h</code>.</li> + + <li>Extended <code>android_dlextinfo</code> in <code>android/dlext.h</code>.</li> + + <li>Annotated <code>__NDK_FPABI__</code> for functions receiving or returning float- or double-type values in <code>stdlib.h</code>, <code>time.h</code>, <code>wchar.h</code>, and <code>complex.h</code>.</li> + </ol> + </ul> + </dd> + + <dt>Other changes:</dt> + <dd> + <ul> + <li>Updated <code>mipsel-linux-android-4.9</code> and <code>mips64el-linux-android-4.9</code>, implementing a new multilib directory layout, and providing support for gdb-7.7</li> + <li>Enhanced <code>cpu-features</code> to detect more arm64 features. (Change list <a href="https://android-review.googlesource.com/#/c/100339">100339</a>.)</li> + </dd> + </ul> + + </dl> + </div> +</div> + +<div class="toggle-content closed"> +<a name="10"></a> + <p> + <a href="#" onclick="return toggleContent(this)"> <img + src="/assets/images/triangle-closed.png" class="toggle-content-img" alt="" + >Android NDK, Revision 10</a> <em>(July 2014)</em> + </p> + <div class="toggle-content-toggleme"> + <dl> + <dt>Important changes:</dt> + <dd> + <ul> + <li>Added 3 new ABIs, all 64-bit: arm64-v8a, x86_64, mips64.</li> Note that: + <ul> + <li>GCC 4.9 is the default compiler for 64-bit ABIs. Clang is currently version 3.4. +<code>NDK_TOOLCHAIN_VERSION=clang</code> + may not work for arm64-v8a and mips64.</li> + <li>Android-L is the first level with 64-bit support. Note that this API +level is a temporary one, and only for L-preview. An actual API level number will replace it at +L-release.</li> + <li>This release includes now includes <code>all32</code> and <code>all64</code> +settings for <code>APP_ABI</code>. + <ul> + <li><code>APP_ABI=all32</code> is equivalent to +<code>APP_ABI=armeabi,armeabi-v7a,x86,mips</code>.</li> + <li><code>APP_ABI=all64</code> is equivalent to +<code>APP_ABI=arm64-v8a,x86_64,mips64</code>.</li> + <li><code>APP_ABI=all</code> selects all ABIs.</li> + </ul> + <li>The new GNU libstdc++ in Android-L contains all <code><tr1/cmath></code> +Before defining your own math function, check <code>_GLIBCXX_USE_C99_MATH_TR1</code> to see a +function with that name already exists, in order to avoid "multiple definition" errors from the +linker.</li> + <li>The cpu-features library has been updated for the ARMv8 kernel. The existing +cpu-features library may fail to detect the presence of NEON on the ARMv8 platform. Recompile your +code with the new version.</li> + </ul> + <li>Added a new <code>platforms/android-L/</code> API directory. It includes:</li> + <ul> + <li>Updated Bionic headers, which had not changed from Android API levels 3 +(Cupcake) to 19 (KitKat). This new version, for level L, is to be synchronized with AOSP.</li> + <li>New media APIs and a native-codec sample.</li> + <li>An updated <code>Android.h</code> header for SLES/OpenSLES, enabling support for +single-precision, floating-point audio format in AudioPlayer.</li> + <li>GLES 3.1 and AEP extensions to <code>libGLESv3.so.</code></li> + <li>GLES2 and GLES3 headers updated to the latest official Khronos versions.</li> + </ul> + <li>Added GCC 4.9 compilers to the 32-/64-bit ABIs. GCC 4.9 is the default (only) compiler +for 64-bit ABIs, as previously mentioned. For 32-bit ABIs, you must explcitly enable GCC 4.9, as +GCC 4.6 is still the default.</li> + <ul> + <li>For ndk-build, enable 32-bit, GCC 4.9 building either by adding +<code>NDK_TOOLCHAIN_VERSION=4.9</code> to <code>Application.mk</code>, or exporting it as an +environment variable from the command line.</li> + <li>For a standalone toolchain, use the <code>--toolchain=</code> option in the +<code>make-standalone-toolchain.sh</code> script. For example: <code>--toolchain=arm-linux-androideabi-4.9.</code></li> + </ul> + <li>Upgraded GDB to version 7.6 in GCC 4.8/4.9 and x86*. Since GDB is still at version GDB-7.3.x in +GCC 4.6 (the default for ARM and MIPS), you must set +<code>NDK_TOOLCHAIN_VERSION=4.8</code> or <code>4.9</code> to enable ndk-gdb to select GDB 7.6.</li> + <li>Added the <code>-mssse3</code> build option to provide SSSE3 support, and made it the default for ABI x86 +(upgrading from SSE3). The image released by Google does not contain SSSE3 instructions.</li> + <li>Updated GCC 4.8 to 4.8.3.</li> + <li>Improved ARM libc++ EH support by switching from gabi++ to libc++abi. For details, see the "C++ Support" section of the documentation. + Note that:</li> + <ul> + <li>All tests except for locale now pass for Clang 3.4 and GCC 4.8. For more +information, see the "C++ Support" section of the documentation.</li> + <li>The libc++ libraries for X86 and MIPS libc++ still use gabi++.</li> + <li>GCC 4.7 and later can now use <atomic>.</li> + <li>You must add <code>-fno-strict-aliasing</code> if you use <code> <list></code>, because <code>__list_imp::_end</code>_ breaks + TBAA rules. (Issue <a href="https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61571">61571</a>.)</li> + <li>As of GCC 4.6, LIBCXX_FORCE_REBUILD:=true no longer rebuilds libc++. Rebuilding it +requires the use of a different compiler. Note that Clang 3.3 is untested.</li> + </ul> + <li>mclinker is now version 2.7, and has aarch64 Linux support.</li> + <li>Added precompiled header support for headers specified by <code>LOCAL_PCH</code>. (Issue <a href="http://b.android.com/25412">25412</a>).</li> + </dd> + <dl> + + + <dt>Important bug fixes:</dt> + <dd> + <ul> + <li>Fixed libc++ so that it now compiles <code>std::feof</code>, etc. (Issue <a +href="http://b.android.com/66668">66668</a>).</li> + <li>Fixed a Clang 3.3/3.4 atomic library call that caused crashes in some of the libc++ +tests for ABI armeabi.</li> + <li>Fixed Clang 3.4 crashes that were occurring on reading precompiled headers. (Issue <a +href="http://b.android.com/66657">66657</a>).</li> + <li>Fixed the Clang 3.3/3.4 <code>-O3</code> assert on:</li> + <code>llvm-3.2/llvm/include/llvm/MDBuilder.h:64: llvm::MDNode* +llvm::MDBuilder::createBranchWeights(llvm::ArrayRef<unsigned int>): Assertion Weights.size() >= 2 +&& "Need at least two branch weights!"</code> (Issue <a href="http://b.android.com/57381">57381</a>). + <li>Fixed the following Clang 3.3/3.4 crash:</li> + <code>Assertion failed: (!Fn && "cast failed but able to resolve overload expression!!"), function CheckCXXCStyleCast, file +Volumes/data/ndk-toolchain/src/llvm-3.3/llvm/tools/clang/lib/Sema/SemaCast.cpp, line 2018</code>. +(Issue <a href="http://b.android.com/66950">66950</a>). + </ul> + </dd> + + <dt>Other bug fixes:</dt> + <dd> + <ul> + <li>Fixed headers:</li> + <ul> + <li>Fixed 32-bit <code>ssize_t</code> to be <code>int</code> instead of <code>long +int</code>.</li> + <li>Fixed <code>WCHAR_MIN</code> and <code>WCHAR_MAX</code> so that they they take +appropriate signs according to the architecture they're running on:</li> + <ul> + <li>X86/MIPS: signed. + <li>ARM: unsigned. + <li>To force X86/MIPS to default to unsigned, use +<code>-D__WCHAR_UNSIGNED__</code>.</li> + <li>To force <code>wchar_t</code> to be 16 bits, use <code>-fshort-wchar</code>.</li> + </ul> + <li>Removed non-existent symbols from 32-bit <code>libc.so</code>, and added <code>pread64</code>, +<code>pwrite64</code>, <code>ftruncate64</code> for +Android API level 12 and higher. (Issue <a href="http://b.android.com/69319">69319</a>). For more +information, see the commit message accompanying AOSP change list + <a href="https://android-review.googlesource.com/#/c/94137">94137</a>.</li> + </ul> + <li>Fixed GCC warning about redefinition of <code>putchar</code>. Warning message reads:</li> + <code>include/stdio.h:236:5: warning: conflicts with previous declaration here +[-Wattributes] int putchar(int);</code> (Change list <a +href="https://android-review.googlesource.com/#/c/91185">91185</a>). + <li>Fixed <code>make-standalone-toolchain.sh --stl=libc++</code> so that it:</li> + <ul> + <li>Copies <code>cxxabi.h</code>. (Issue <a +href="http://b.android.com/68001">68001</a>).</li> + <li>Runs in directories other than the NDK install directory. (Issues <a +href="http://b.android.com/67690">67690</a> and <a href="http://b.android.com/68647">68647</a>).</li> + </ul> + <li>Fixed GCC/Windows to quote arguments only when necessary for spawning processes in +external programs. This change decreases the likelihood of exceeding the 32K length limit.</li> + <li>Fixed an issue that made it impossible to adjust the <code>APP_PLATFORM</code> +environment variable.</li> + <li>Fixed the implementation of <code>IsSystemLibrary()</code> in crazy_linker so that it +uses <code>strrchr()</code> + instead of <code>strchr()</code> to find the library path's true basename.</li> + <li>Fixed native-audio's inability to build in debug mode.</li> + <li>Fixed gdb's inability to print extreme floating-point numbers. (Issue <a +href="http://b.android.com/69203">69203</a>).</li> + <li>Fixed Clang 3.4 inability to compile with <code>-Wl,-shared</code> (as opposed to +<code>-shared</code>, which + had no compilation issues). The problem was that Clang added <code>-pie</code> for Android +targets if neither <code>-shared</code> nor <code>-static</code> existed. This behavior, which was +incorrect, caused the linker to complain that <code>-shared</code> and <code>-pie</code> could not +co-exist.</li> + + </ul> + </dd> + + + <dt>Other changes:</dt> + <dd> + <ul> + <li>Added <code>arm_neon.h</code> to the x86 toolchain so that it now emulates ~47% of +Neon. There is currently no support for 64-bit types. For more information, see the section on ARM +Neon intrinsics support in the x86 documentation.</li> + <li>Ported ARM/GOT_PREL optimization (present in GCC 4.6 built from the GCC google branch) to +ARM GCC 4.8/4.9. This optimization sometimes reduces instruction count when accessing global +variables. As an example, see the build.sh script in +<code>$NDK/tests/build/b14811006-GOT_PREL-optimization/</code>.</li> + <li>Added ARM version for STL gabi++, stlport, and libc++. They now have both it and Thumb +mode.</li> + <li>It is now possible to call the make-standalone-toolchain.sh script with +<code>--toolchain=x86_64-linux-android-4.9</code>, which is equivalent to +<code>--toolchain=x86_64-4.9</code>.</li> + </dd> + </ul> + </dl> + </div> +</div> + + +<div class="toggle-content closed"> +<a name="9d"></a> + <p> + <a href="#" onclick="return toggleContent(this)"> <img + src="/assets/images/triangle-closed.png" class="toggle-content-img" alt="" + >Android NDK, Revision 9d</a> <em>(March 2014)</em> + </p> + <div class="toggle-content-toggleme"> + <dl> + <dt>Important changes:</dt> + <dd> + <ul> + <li>Added support for the Clang 3.4 compiler. The +<code>NDK_TOOLCHAIN_VERSION=clang</code> option now picks Clang 3.4. GCC 4.6 is +still the default compiler.</li> + <li>Added <code>APP_ABI=armeabi-v7a-hard</code>, with +additional multilib option <code>-mfloat-abi=hard</code>. These options are for +use with ARM GCC 4.6/4.8 and Clang 3.3/3.4 (which use 4.8's assembler, linker, +and libs). When using these options, note the following changes:</li> + <ul> + <li> When executing the <code>ndk-build</code> script, add the +following options for armeabi-v7a target: +<pre>TARGET_CFLAGS += -mhard-float -D_NDK_MATH_NO_SOFTFP=1 +TARGET_LDFLAGS += -Wl,--no-warn-mismatch -lm_hard</pre> +The built library is copied to <code>libs/armeabi-v7a</code>. For make to +behave as expected, you cannot specify both <code>armeabi-v7a</code> and +<code>armeabi-v7a-hard</code> as make targets (i.e., on the APP_ABI= line). +Doing so causes one of them to be ignored. Note that <code>APP_ABI=all</code> +is still equivalent to +<code>armeabi armeabi-v7a x86 mips</code>.</li> + <li>The <code>make-standalone-toolchain.sh</code> script copies +additional libaries under <code>/hard</code> directories. + Add the above <code>CFLAGS</code> and <code>LFLAGS</code> to your +makefile to enable GCC or Clang to link with + libraries in <code>/hard</code>.</li> + </ul> + <li>Added the yasm assembler, as well as <code>LOCAL_ASMFLAGS</code> +and <code>EXPORT_ASMFLAGS</code> flags for x86 +targets. The <code>ndk-build</code> script uses +<code>prebuilts/*/bin/yasm*</code> to build <code>LOCAL_SRC_FILES</code> that +have the <code>.asm</code> extension.</li> + <li>Updated MClinker to 2.6.0, which adds <code>-gc-sections</code> +support.</li> + <li>Added experimental libc++ support (upstream r201101). Use this new +feature by following these steps: + <ul> + <li>Add <code>APP_STL := c++_static</code> or <code>APP_STL := +c++_shared</code> in <code>Application.mk</code>. + You may rebuild from source via <code>LIBCXX_FORCE_REBUILD := +true</code></li> + <li>Execute <code>make-standalone-toolchain.sh --stl=libc++</code> +to create a standalone toolchain with libc++ headers/lib.</li> + </ul> + For more information, see +<code>CPLUSPLUS-SUPPORT.html</code>. +(Issue <a href="http://b.android.com/36496">36496</a>)</li> + </ul> + </dd> + <dl> + <dt>Important bug fixes:</dt> + <dd> + <ul> + <li>Fixed an uncaught throw from an unexpected +exception handler for GCC 4.6/4.8 ARM EABI. (GCC Issue <a +href="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59392">59392</a>)</li> + <li>Fixed GCC 4.8 so that it now correctly resolves partial +specialization of a template with + a dependent, non-type template argument. (GCC Issue <a +href="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59052">59052</a>)</li> + <li>Added more modules to prebuilt python (Issue <a +href="http://b.android.com/59902">59902</a>): + <ul> + <li>Mac OS X: <code>zlib</code>, <code>bz2</code>, +<code>_curses</code>, <code>_curses_panel</code>, <code>_hashlib</code>, +<code>_ssl</code></li> + <li>Linux: <code>zlib</code>, <code>nis</code>, +<code>crypt</code>, <code>_curses</code>, and <code>_curses_panel</code></li> + </ul> + <li>Fixed the x86 and MIPS gdbserver +<code>event_getmsg_helper</code>.</li> + <li>Fixed numerous issues in the RenderScript NDK toolchain, including +issues with compatibility across older devices and C++ reflection.</li> +<br> + </ul> + </dd> + + <dt>Other bug fixes:</dt> + <dd> + <ul> + <li>Header fixes: + <ul> + <li>Fixed a missing <code>#include <sys/types.h></code> in +<code>android/asset_manager.h</code> for Android API level 13 and higher. + (Issue <a href="http://b.android.com/64988">64988</a>)</li> + <li>Fixed a missing <code>#include <stdint.h></code> in +<code>android/rect_manager.h</code> for Android API level 14 and higher.</li> + <li>Added <code>JNICALL</code> to <code>JNI_OnLoad</code> and +<code>JNI_OnUnload</code> in <code>jni.h</code>. Note that <code>JNICALL</code> + is defined as <code>__NDK_FPABI__</code> For more information, see +<code>sys/cdefs.h</code>.</li> + <li>Updated the following headers so that they can be included +without the need to +manually include their dependencies (Issue <a +href="http://b.android.com/64679">64679</a>):</li> +<pre> +android/tts.h +EGL/eglext.h +fts.h +GLES/glext.h +GLES2/gl2ext.h +OMXAL/OpenMAXSL_Android.h +SLES/OpenSLES_Android.h +sys/prctl.h +sys/utime.h +</pre> + <li>Added <code>sys/cachectl.h</code> for all architectures. MIPS +developers can now include this header instead of writing <code>#ifdef +__mips__</code>.</li> + <li></code>Fixed <code>platforms/android-18/include/android/input.h +</code> by adding <code>__NDK_FPABI__</code> to functions taking or returning +float or double values.</li> + <li>Fixed MIPS <code>struct stat</code>, which was incorrectly set +to its 64-bit counterpart for Android API level 12 and later. This wrong +setting was a +regression introduced in release r9c.</li> + <li>Defined <code>__PTHREAD_MUTEX_INIT_VALUE</code>, +<code>__PTHREAD_RECURSIVE_MUTEX_INIT_VALUE</code>, + and <code>__PTHREAD_ERRORCHECK_MUTEX_INIT_VALUE</code> for Android API +level 9 and lower.</li> + <li>Added <code>scalbln</code>, <code>scalblnf</code>, and +<code>scalblnl</code> to x86 <code>libm.so</code> for APIs 18 and later.</li> + <li>Fixed a typo in +<code>sources/android/support/include/iconv.h</code>. + (Issue <a href="http://b.android.com/63806">63806</a>)</li> + + </ul> + </li> + <li>Fixed gabi++ <code>std::unexpected()</code> to call +<code>std::terminate()</code> so that + a user-defined <code>std::terminate()</code> handler has a chance to run. +</li> + <li>Fixed gabi++ to catch <code>std::nullptr</code>.</li> + <li>Fixed samples Teapot and MoreTeapots: + <ul> + <li>Solved a problem with Tegra 2 and 3 chips by changing specular +variables to use medium precision. Values for specular power can now be less +than 1.0. </li> + <li>Changed the samples so that pressing the volume button restores +immersive mode and invalidates +<code>SYSTEM_UI_FLAG_IMMERSIVE_STICKY</code>. Screen rotation does not +trigger <code>onSystemUiVisibilityChange</code>, and so does not restore +immersive mode.</li> + </ul> + </li> + <li>Fixed the <code>ndk-build</code> script to add +<code>-rpath-link=$SYSROOT/usr/lib</code> and +<code>-rpath-link=$TARGET_OUT</code> in order to use <code>ld.bfd</code> to +link executables. (Issue <a href="http://b.android.com/64266">64266</a>)</li> + <li>Removed <code>-Bsymbolic</code> from all STL builds.</li> + <li>Fixed <code>ndk-gdb-py.cmd</code> by setting <code>SHELL</code> as +an environment variable +instead of passing it to + <code>python.exe</code>, which ignores the setting. + (Issue <a href="http://b.android.com/63054">63054</a>)</li> + <li>Fixed the <code>make-standalone-toolchain.sh</code> script so that +the <code>--stl=stlport</code> option copies the gabi++ headers instead of +symlinking them; the <code>cmd.exe</code> and MinGW shells do not understand +symlinks created by cygwin.</li> + </ul> + </dd> + + <dt>Other changes:</dt> + <dd> + <ul> + <li>Applied execution permissions to all <code>*cmd</code> scripts +previously intended for use only in the <code>cmd.exe</code> shell, in case +developers prefer to use <code>ndk-build.cmd</code> in cygwin instead of the +recommended <code>ndk-build</code> script.</li> + <li>Improved the speed of the <code>make-standalone-toolchain.sh</code> +script by moving instead of copying if the specified destination directory does +not exist.</li> + </dd> + </ul> + </dl> + </div> +</div> + +<div class="toggle-content closed"> +<a name="9c"></a> + <p> + <a href="#" onclick="return toggleContent(this)"> <img + src="/assets/images/triangle-closed.png" class="toggle-content-img" alt="" + >Android NDK, Revision 9c</a> <em>(December 2013)</em> + </p> + <div class="toggle-content-toggleme"> +<p>This is a bug-fix-only release.</p> + <dl> + <dt>Important bug fixes:</dt> + <dd> + <ul> + <li>Fixed a problem with GCC 4.8 ARM, in which the stack pointer is +restored too early. This problem prevented the frame pointer from reliably +accessing a variable in the stack frame. (GCC Issue <a +href="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58854">58854</a>)</li> +<li>Fixed a problem with GCC 4.8 libstdc++, in which a bug in +std::nth_element was causing generation of code that produced a random +segfault. (Issue <a +href="https://code.google.com/p/android/issues/detail?id=62910">62910</a>)</li> + <li>Fixed GCC 4.8 ICE in cc1/cc1plus with +<code>-fuse-ld=mcld</code>, so that the following error no longer occurs: +<pre>cc1: internal compiler error: in common_handle_option, at +opts.c:1774</pre></li> + <li>Fixed <code>-mhard-float</code> support for +<code>__builtin</code> math functions. For ongoing information on fixes for +<code>-mhard-float</code> with STL, please follow Issue <a +href="http://b.android.com/61784">61784</a>.</li> + </ul> + </dd> + + <dt>Other bug fixes:</dt> + <dd> + <ul> + <li>Header fixes: + <ul> + <li>Changed prototype of <code>poll</code> to <code>poll(struct +pollfd *, nfds_t, int);</code> in <code>poll.h</code>.</li> + <li>Added <code>utimensat</code> to <code>libc.so</code> for Android +API levels 12 and 19. These libraries are now included for all Android API +levels 12 through 19.</li> +<li>Introduced <code>futimens</code> into <code>libc.so</code>, for Android API +level 19.</li> +<li>Added missing <code>clock_settime()</code> and +<code>clock_nanosleep()</code> to <code>time.h</code> for Android API level 8 +and higher.</li> +<li>Added <code>CLOCK_MONOTONIC_RAW, CLOCK_REALTIME_COARSE, +CLOCK_MONOTONIC_COARSE, CLOCK_BOOTTIME, CLOCK_REALTIME_ALARM,</code> and +<code>CLOCK_BOOTTIME_ALARM</code> in <code>time.h.</code></li> +<li>Removed obsolete <code>CLOCK_REALTIME_HR</code> and +<code>CLOCK_MONOTONIC_HR.</code></li> + </ul> + </li> + <li>In samples Teapot, MoreTeapots, and +<code>source/android/ndk_helper</code>: + <ul> +<li>Changed them so that they now use a hard-float abi for armeabi-v7a.</li> +<li>Updated them to use immersive mode on Android API level 19 and +higher.</li> +<li>Fixed a problem with <code>Check_ReleaseStringUTFChars</code> in +<code>/system/lib/libdvm.so</code> that was causing crashes on x86 devices.</li> + </ul> + </li> +<li>Fixed <code>ndk-build</code> fails that happen in cygwin when the NDK +package is +referenced via symlink.</li> +<li>Fixed <code>ndk-build.cmd</code> fails that happen in windows +<code>cmd.exe</code> when +<code>LOCAL_SRC_FILES</code> contains absolute paths. (Issue <a +href="https://android-review.googlesource.com/#/c/69992">69992</a>)</li> +<li>Fixed the <code>ndk-stack</code> script to proceed even when it can't parse +a frame due to inability to find a routine, filename, or line number. In any of +these cases, it prints <code>??</code>.</li> +<li>Fixed the <code>ndk-stack</code> stack for windows-x64_64 targets so that +it no longer erroneously matches a frame line with a line in the +<code>stack:</code> section that doesn't contain <code>pc</code>, +<code>eip</code>, or <code>ip</code>. For example: +<pre>I/DEBUG ( 1151): #00 5f09db68 401f01c4 +/system/lib/libc.so</pre></li> +<li>Fixed gabi++ so that it: + <ul> + <li>Does not use malloc() to allocate C++ thread-local + objects.</li> + <li>Avoids deadlocks in gabi++ in cases where libc.debug.malloc is +non-zero in userdebug/eng Android platform builds.</li> + </ul> + </ul> + </dd> + + <dt>Other changes:</dt> + <dd> + <ul> + <li>Added <code>LOCAL_EXPORT_LDFLAGS</code>.</li> +<li>Introduced the <code>NDK_PROJECT_PATH=null</code> setting for use in an +integrated build system where options are explicitly passed to +<code>ndk-build</code>. With this setting, <code>ndk-build</code> makes no +attempt to look for <code>NDK_PROJECT_PATH.</code> This setting also prevents +variables from deriving default settings from NDK_PROJECT_PATH. As a result, +the following variables must now be explicitly specified (with their default +values if such exist): <code>NDK_OUT, NDK_LIBS_OUT, APP_BUILD_SCRIPT, +NDK_DEBUG</code> (optional, default to 0), and other <code>APP_*</code>'s +contained in <code>Application.mk</code>.</li> +<li><code>APP_ABI</code> can now be enumerated in a comma-delimited list. For +example: +<pre>APP_ABI := "armeabi,armeabi-v7a"</pre></li> +<li>Provided the ability to rebuild all of STL with debugging info in an +optional, separate package called +<code>android-ndk-r9c-cxx-stl-libs-with-debugging-info.zip</code>, using the +<code>-g</code> option. This option +helps the <code>ndk-stack</code> script provide better a stack dump across STL. +This change should not affect the code/size of the final, stripped file.</li> +<li>Enhanced <code>hello-jni</code> samples to report <code>APP_ABI</code> at +compilation.</li> +<li>Used the <code>ar</code> tool in Deterministic mode (option +<code>-D</code>) to build static libraries. (Issue <a +href="http://b.android.com/60705">60705</a>)</li> + </ul> + </dd> + + </dl> + </div> +</div> + +<div class="toggle-content closed"> +<a name="9b"></a> + <p> + <a href="#" onclick="return toggleContent(this)"> <img + src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" alt="" + >Android NDK, Revision 9b</a> <em>(October 2013)</em> + </p> + <div class="toggle-content-toggleme"> + <dl> + <dt>Important changes:</dt> + <dd> + <ul> + <li>Updated {@code include/android/*h} and {@code math.h} for all Android API levels up to + 18, including the addition of levels 13, 15, 16 and 17. + For information on added APIs, see commit messages for Changes + <a href="https://android-review.googlesource.com/68012">68012</a> and + <a href="https://android-review.googlesource.com/68014">68014</a>. + (Issues <a href="http://b.android.com/47150">47150</a>, + <a href="http://b.android.com/58528">58528</a>, and + <a href="http://b.android.com/38423">38423</a>)</li> + <li>Added support for Android API level 19, including Renderscript binding.</li> + <li>Added support for <code>-mhard-float</code> in the existing armeabi-v7a ABI. For more + information and current restrictions on Clang, see + {@code tests/device/hard-float/jni/Android.mk}.</li> + <li>Migrated from GNU Compiler Collection (GCC) 4.8 to 4.8.2, and added diagnostic color + support. To enable diagnostic colors, set <code>-fdiagnostics-color=auto</code>, + <code>-fdiagnostics-color=always,</code> or export {@code GCC_COLORS} as shown below: +<pre> +GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' +</pre> + For more information, see + <a href="http://gcc.gnu.org/onlinedocs/gcc/Language-Independent-Options.html">GCC + Language Independent Options</a>. + </li> + <li>Added two new samples to demonstrate OpenGL ES 3.0 features: Teapot and MoreTeapots. + These samples run on devices with Android 4.1 (API level 16) and higher.</li> + <li>Deprecated GCC 4.7 and Clang 3.2 support, which will be removed in the next + release.</li> + </ul> + </dd> + + <dt>Important bug fixes:</dt> + <dd> + <ul> + <li>Fixed problem with ARM GCC 4.6 {@code thumb2} failing to generate 16-bit relative jump + tables. (<a href="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48328">GCC Issue</a>)</li> + <li>Fixed GCC 4.8 internal compiler error (ICE) on + {@code g++.dg/cpp0x/lambda/lambda-defarg3.C}. + (<a href="https://android-review.googlesource.com/62770">Change 62770</a>, + <a href="http://gcc.gnu.org/ml/gcc/2013-07/msg00424.html">GCC Issue</a>)</li> + <li>Fixed a problem with Windows 32-bit {@code *-gdb.exe} executables failing to launch. + (<a href="http://b.android.com/58975">Issue 58975</a>)</li> + <li>Fixed GCC 4.8 ICE when building bullet library. The error message is as follows: + <pre>internal compiler error: verify_flow_info failed</pre> + (<a href="http://b.android.com/58916">Issue 58916</a>, + <a href="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58165">GCC Issue</a>)</li> + <li>Modified GDB/ARM build to skip {@code ARM.exidx} data for unwinding in prologue code and + added a command ({@code set arm exidx-unwinding}) to control exidx-based stack unwinding. + (<a href="http://b.android.com/55826">Issue 55826</a>)</li> + <li>Fixed Clang 3.3 MIPS compiler problem where HI and LO registers are incorrectly + reused.</li> + <li>Fixed issue with MIPS 4.7 ICE in {@code dbx_reg_number}. The error message is as +follows: +<pre> +external/icu4c/i18n/decimfmt.cpp:1322:1: +internal compiler error: in dbx_reg_number, at dwarf2out.c:10185 +</pre> + (<a href="http://gcc.gnu.org/ml/gcc-patches/2012-12/msg00830.html">GCC Patch</a>) + + </li> + + </ul> + </dd> + + <dt>Other bug fixes:</dt> + <dd> + <ul> + <li>Header fixes + <ul> + <li>Fixed the ARM {@code WCHAR_MIN} and {@code WCHAR_MAX} to be unsigned according to + spec (the X86/MIPS versions are signed). Define {@code _WCHAR_IS_ALWAYS_SIGNED} to + restore old behavior. (<a href="http://b.android.com/57749">Issue 57749</a>)</li> + <li>Fixed {@code include/netinet/tcp.h} to contain {@code TCP_INFO} state enum. + (<a href="http://b.android.com/38881">Issue 38881</a>)</li> + <li>Fixed the {@code cdefs_elh.h} macro {@code _C_LABEL_STRING} to stop generating + warnings in the GCC 4.8 toolchain when using c++11 mode. + (<a href="http://b.android.com/58135">Issue 58135</a>, + <a href="http://b.android.com/58652">Issue 58652</a>)</li> + <li>Removed non-existent functions {@code imaxabs} and {@code imaxdiv} from header + {@code inttypes.h}.</li> + <li>Fixed issue with {@code pthread_exit()} return values and {@code pthread_self()}. + (<a href="http://b.android.com/60686">Issue 60686</a>)</li> + <li>Added missing {@code mkdtemp()} function, which already exists in {@code bionic} + header {@code stdlib.h}.</li> + </ul> + </li> + <li>Fixed problem building {@code samples/gles3jni} with Clang on Android API level 11.</li> + <li>Fixed MCLinker to allow multiple occurrences of the following options: + {@code -gc-sections} and {@code --eh-frame-hdr}.</li> + <li>Fixed MCLinker to accept the {@code --no-warn-mismatch} option.</li> + <li>Modified {@code cpu-features} option to not assume all VFPv4 devices support IDIV. + Now this option only adds IDIV to white-listed devices, including Nexus 4. + (<a href="http://b.android.com/57637">Issue 57637</a>)</li> + <li>Fixed problem with {@code android_native_app_glue.c} erroneously logging errors on event + predispatch operations.</li> + <li>Fixed all operations on {@code gabi++} terminate and unexpected_handler to be + thread-safe.</li> + <li>Fixed several issues with Clang <code>-integrated-as</code> option so it can pass + tests for {@code ssax-instructions} and {@code fenv}.</li> + <li>Fixed GCC 4.6/4.7/4.8 compiler to pass the linker option {@code --eh-frame-hdr} even + for static executables. For more information, see the + <a href="http://gcc.gnu.org/ml/gcc-patches/2012-09/msg00969.html">GCC patch</a>.</li> + <li>Fixed extra apostrophe in <code>CPU-ARCH-ABIS.html</code>. For more information, see + <code>NDK-DEPENDS.html</code>. (<a href="http://b.android.com/60142">Issue 60142</a>)</li> + <li>Fixed extra quotes in ndk-build output on Windows. + (<a href="http://b.android.com/60649">Issue 60649</a>)</li> + <li>Fixed Clang 3.3 to compile ARM's built-in, atomic operations such as + {@code __atomic_fetch_add}, {@code __atomic_fetch_sub}, and {@code __atomic_fetch_or}. + </li> + <li>Fixed Clang 3.3 ICE with customized {@code vfprintf}. + (<a href="http://llvm.org/bugs/show_bug.cgi?id=16344">Clang issue</a>) + </li> + </ul> + </dd> + + <dt>Other changes:</dt> + <dd> + <ul> + <li>Enabled OpenMP for all GCC builds. To use this feature, add the following flags to your + build settings: +<pre> +LOCAL_CFLAGS += -fopenmp +LOCAL_LDFLAGS += -fopenmp +</pre> + For code examples, see {@code tests/device/test-openmp}</li> + <li>Reduced the size of {@code ld.mcld} significantly (1.5MB vs. {@code ld.bfd} 3.5MB and + {@code ld.gold} 7.5MB), resulting in a speed improvement of approximately 20%.</li> + <li>Added <code>LOCAL_CONLYFLAGS</code> and <code>APP_CONLYFLAGS</code> to specify + options applicable to C only but not C++. The existing <code>LOCAL_CFLAGS</code> + and <code>APP_CFLAGS</code> are also used for C++ compilation (to save trouble of + specifying most options twice), so options such as <code>-std=gnu99</code> may fail in + g++ builds with a warning and clang++ builds with an error.</li> + <li>Added {@code gabi++} array helper functions.</li> + <li>Modified GCC builds so that all {@code libgcc.a} files are built with + <code>-funwind-tables</code> to allow the stack to be unwound past previously blocked + points, such as <code>__aeabi_idiv0</code>.</li> + <li>Added Ingenic MXU support in MIPS GCC4.6/4.7/4.8 with new <code>-mmxu</code> +option.</li> + <li>Extended MIPS GCC4.6/4.7/4.8 <code>-mldc1-sdc1</code> to control ldxc1/sdxc1 too</li> + <li>Added crazy linker. For more information, see + {@code sources/android/crazy_linker/README.TXT}.</li> + <li>Fixed {@code bitmap-plasma} to draw to full screen rather than a 200x200 pixel +area.</li> + <li>Reduced linux and darwin toolchain sizes by 25% by creating symlinks to identical files. + </li> + </ul> + </dd> + + </dl> + </div> +</div> + + +<div class="toggle-content closed"> +<a name="9"></a> + <p> + <a href="#" onclick="return toggleContent(this)"> <img + src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" alt="" + >Android NDK, Revision 9</a> <em>(July 2013)</em> + </p> + <div class="toggle-content-toggleme"> + <dl> + <dt>Important changes:</dt> + <dd> + <ul> + <li>Added support for Android 4.3 (API level 18). For more information, see + {@code STABLE-APIS.html} and new code examples in {@code samples/gles3jni/README}. + <li>Added headers and libraries for OpenGL ES 3.0, which is supported by Android 4.3 + (API level 18) and higher.</li> + <li>Added GNU Compiler Collection (GCC) 4.8 compiler to the NDK. Since GCC 4.6 is still + the default, you must explicitly enable this option: + <ul> + <li>For {@code ndk-build} builds, export {@code NDK_TOOLCHAIN_VERSION=4.8} or + add it in {@code Application.mk}.</li> + <li>For standalone builds, use the {@code --toolchain=} option in + {@code make-standalone-toolchain.sh}, for example:<br> + {@code --toolchain=arm-linux-androideabi-4.8}</li> + </ul> + <p class="note"><strong>Note:</strong> + The {@code -Wunused-local-typedefs} option is enabled by {@code -Wall}. Be + sure to add {@code __attribute__((unused))} if you use compile-time asserts like + {@code sources/cxx-stl/stlport/stlport/stl/config/features.h}, line #311. For more + information, see + <a href="https://android-review.googlesource.com/#/c/55460">Change 55460</a></p> + <p class="note"><strong>Note:</strong> + In the GCC 4.7 release and later, ARM compilers generate unaligned access code by + default for ARMv6 and higher build targets. You may need to add the + {@code -mno-unaligned-access} build option when building for kernels that do not support + this feature.</p> + </li> + <li>Added Clang 3.3 support. The {@code NDK_TOOLCHAIN_VERSION=clang} build option + now picks Clang 3.3 by default. + <p class="note"><strong>Note:</strong> + Both GCC 4.4.3 and Clang 3.1 are deprecated, and will be removed from the next NDK + release.</p></li> + <li>Updated GNU Project Debugger (GDB) to support python 2.7.5.</li> + <li>Added MCLinker to support Windows hosts. Since {@code ld.gold} + is the default where available, you must add {@code -fuse-ld=mcld} in + {@code LOCAL_LDFLAGS} or {@code APP_LDFLAGS} to enable MCLinker.</li> + <li>Added {@code ndk-depends} tool which prints ELF library dependencies. + For more information, see {@code NDK-DEPENDS.html}. + (<a href="http://b.android.com/53486">Issue 53486</a>)</li> + </ul> + </dd> + + <dt>Important bug fixes:</dt> + <dd> + <ul> + <li>Fixed potential event handling issue in {@code android_native_app_glue}. + (<a href="http://b.android.com/41755">Issue 41755</a>)</li> + <li>Fixed ARM/GCC-4.7 build to generate sufficient alignment for NEON load and store + instructions VST and VLD. + (<a href="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57271">GCC Issue 57271</a>)</li> + <li>Fixed a GCC 4.4.3/4.6/4.7 internal compiler error (ICE) for a constant negative index + value on a string literal. + (<a href="http://b.android.com/54623">Issue 54623</a>)</li> + <li>Fixed GCC 4.7 segmentation fault for constant initialization with an object address. + (<a href="http://b.android.com/56508">Issue 56508</a>)</li> + <li>Fixed GCC 4.6 ARM segmentation fault for <code>-O</code> values when using Boost + 1.52.0. (<a href="http://b.android.com/42891">Issue 42891</a>) + <li>Fixed {@code libc.so} and {@code libc.a} to support the {@code wait4()} function. + (<a href="http://b.android.com/19854">Issue 19854</a>)</li> + <li>Updated the x86 libc.so and libc.a files to include the {@code clone()} + function.</li> + <li>Fixed {@code LOCAL_SHORT_COMMANDS} bug where the {@code linker.list} file is + empty or not used.</li> + <li>Fixed GCC MIPS build on Mac OS to use CFI directives, without which + {@code ld.mcld --eh-frame-hdr} fails frequently.</li> + <li>Fixed Clang 3.2 X86/MIPS internal compiler error in {@code llvm/lib/VMCore/Value.cpp}. + (<a href="https://android-review.googlesource.com/#/c/59021">Change 59021</a>)</li> + <li>Fixed GCC 4.7 64-bit Windows assembler crash. (Error: {@code out of memory allocating + 4294967280 bytes}).</li> + <li>Updated {@code ndk-gdb} script so that the {@code --start} or {@code --launch} actions + now wait for the GNU Debug Server, so that it can more reliably hit breakpoints set + early in the execution path (such as breakpoints in JNI code). + (<a href="http://b.android.com/41278">Issue 41278</a>) + <p class="note"><strong>Note:</strong> + This feature requires jdb and produces warning about pending breakpoints. + Specify the {@code --nowait} option to restore previous behavior. + </p> + </li> + <li>Fixed GDB crash when library list is empty.</li> + <li>Fixed GDB crash when using a {@code stepi} command past a {@code bx pc} or + {@code blx pc} Thumb instruction. + (<a href="http://b.android.com/56962">Issue 56962</a>, + <a href="http://b.android.com/36149">Issue 36149</a>)</li> + <li>Fixed MIPS {@code gdbserver} to look for {@code DT_MIPS_RLD_MAP} instead of + {@code DT_DEBUG}. (<a href="http://b.android.com/56586">Issue 56586</a>)</li> + <li>Fixed a circular dependency in the ndk-build script, for example: If A->B and + B->B, then B was dropped from build. + (<a href="http://b.android.com/56690">Issue 56690</a>)</li> + </ul> + </dd> + + <dt>Other bug fixes:</dt> + <dd> + <ul> + <li>Fixed the {@code ndk-build} script to enable you to specify a version of Clang as a + command line option (e.g., {@code NDK_TOOLCHAIN_VERSION=clang3.2}). Previously, only + specifying the version as an environment variable worked.</li> + <li>Fixed gabi++ size of {@code _Unwind_Exception} to be 24 for MIPS build targets when + using the Clang compiler. + (<a href="https://android-review.googlesource.com/#/c/54141">Change 54141</a>)</li> + <li>Fixed the {@code ndk-build} script to ensure that built libraries are actually + removed from projects that include prebuilt static libraries when using the + {@code ndk-build clean} command. + (<a href="https://android-review.googlesource.com/#/c/54461">Change 54461</a>, + <a href="https://android-review.googlesource.com/#/c/54480">Change 54480</a>)</li> + <li>Modified the {@code NDK_ANALYZE=1} option to be less verbose.</li> + <li>Fixed {@code gnu-libstdc++/Android.mk} to include a {@code backward/} path for builds + that use backward compability. + (<a href="http://b.android.com/53404">Issue 53404</a>)</li> + <li>Fixed a problem where {@code stlport new} sometimes returned random values.</li> + <li>Fixed {@code ndk-gdb} to match the order of {@code CPU_ABIS}, not {@code APP_ABIS}. + (<a href="http://b.android.com/54033">Issue 54033</a>)</li> + <li>Fixed a problem where the NDK 64-bit build on MacOSX choses the wrong path for + compiler. + (<a href="http://b.android.com/53769">Issue 53769</a>)</li> + <li>Fixed build scripts to detect 64-bit Windows Vista. + (<a href="http://b.android.com/54485">Issue 54485</a>)</li> + <li>Fixed x86 {@code ntonl/swap32} error: {@code invalid 'asm': operand number + out of range}. + (<a href="http://b.android.com/54465">Issue 54465</a>, + <a href="https://android-review.googlesource.com/#/c/57242">Change 57242</a>)</li> + <li>Fixed {@code ld.gold} to merge string literals.</li> + <li>Fixed {@code ld.gold} to handle large symbol alignment.</li> + <li>Updated {@code ld.gold} to enable the {@code --sort-section=name} option.</li> + <li>Fixed GCC 4.4.3/4.6/4.7 to suppress the {@code -export-dynamic} option for + statically linked programs. GCC no longer adds an {@code .interp} section for statically + linked programs.</li> + <li>Fixed GCC 4.4.3 {@code stlport} compilation error about inconsistent {@code typedef} + of {@code _Unwind_Control_Block}. + (<a href="http://b.android.com/54426">Issue 54426</a>)</li> + <li>Fixed {@code awk} scripts to handle {@code AndroidManifest.xml} files created on + Windows which may contain trailing {@code \r} characters and cause build errors. + (<a href="http://b.android.com/42548">Issue 42548</a>)</li> + <li>Fixed {@code make-standalone-toolchain.sh} to probe the {@code prebuilts/} + directory to detect if the host is 32 bit or 64 bit.</li> + <li>Fixed the Clang 3.2 {@code -integrated-as} option.</li> + <li>Fixed the Clang 3.2 ARM EHABI compact model {@code pr1} and {@code pr2} handler data. + </li> + <li>Added Clang {@code -mllvm -arm-enable-ehabi} option to fix the following Clang error: + <pre>clang: for the -arm-enable-ehabi option: may only occur zero or one times!</pre> + </li> + <li>Fixed build failure when there is no {@code uses-sdk} element in application + manifest. (<a href="http://b.android.com/57015">Issue 57015</a>)</li> + </ul> + + </dd> + <dt>Other changes:</dt> + <dd> + <ul> + <li>Header Fixes + <ul> + <li>Modified headers to make {@code __set_errno} an inlined function, since + {@code __set_errno} in {@code errno.h} is deprecated, and {@code libc.so} no longer + exports it.</li> + <li>Modified {@code elf.h} to include {@code stdint.h}. + (<a href="http://b.android.com/55443">Issue 55443</a>)</li> + <li>Fixed {@code sys/un.h} to be included independently of other headers. + (<a href="http://b.android.com/53646">Issue 53646</a>)</li> + <li>Fixed all of the {@code MotionEvent_getHistorical} API family to take the + {@code const AInputEvent* motion_event}. + (<a href="http://b.android.com/55873">Issue 55873</a>)</li> + <li>Fixed {@code malloc_usable_size} to take {@code const void*}. + (<a href="http://b.android.com/55725">Issue 55725</a>)</li> + <li>Fixed stdint.h to be more compatible with C99. + (<a href="https://android-review.googlesource.com/#/c/46821">Change 46821</a>)</li> + <li>Modified {@code wchar.h} to not redefine {@code WCHAR_MAX} and + {@code WCHAR_MIN}</li> + <li>Fixed {@code <inttypes.h>} declaration for pointer-related {@code PRI} and + {@code SCN} macros. (<a href="http://b.android.com/57218">Issue 57218</a>)</li> + <li>Changed the {@code sys/cdefs.h} header so that {@code __WCHAR_TYPE__} is 32-bit + for API levels less than 9, which means that {@code wchat_t} is 32-bit for all + API levels. To restore the previous behavior, define the {@code _WCHAR_IS_8BIT} + boolean variable. (<a href="http://b.android.com/57267">Issue 57267</a>)</li> + </ul> + </li> + <li>Added more formatting in NDK {@code docs/} and miscellaneous documentation fixes. + </li> + <li>Added support for a thin archive technique when building static libraries. + (<a href="http://b.android.com/40303">Issue 40303</a>)</li> + <li>Updated script {@code make-standalone-toolchain.sh} to support the {@code stlport} + library in addition to {@code gnustl}, when you specify the option + {@code --stl=stlport}. For more information, see {@code STANDALONE-TOOLCHAIN.html}.</li> + <li>Updated the {@code make-standalone-toolchain.sh} script so that the + {@code --llvm-version=} option creates the {@code $TOOLCHAIN_PREFIX-clang} and + {@code $TOOLCHAIN_PREFIX-clang++} scripts in addition to {@code clang} and + {@code clang++}, to avoid using the host's clang and clang++ definitions by accident. + </li> + <li>Added two flags to re-enable two optimizations in upstream Clang but disabled in + NDK for better compatibility with code compiled by GCC: + <ul> + <li>Added a {@code -fcxx-missing-return-semantics} flag to re-enable <em>missing +return + semantics</em> in Clang 3.2+. Normally, all paths should terminate with a return + statement for a value-returning function. If this is not the case, clang inserts + an undefined instruction (or trap in debug mode) at the path without a return + statement. If you are sure your code is correct, use this flag to allow the + optimizer to take advantage of the undefined behavior. If you are not sure, do not + use this flag. The caller may still receive a random incorrect value, but the + optimizer will not exploit it and make your code harder to debug.</li> + <li>Added a {@code -fglobal-ctor-const-promotion} flag to re-enable + promoting global variables with static constructor to be constants. With this flag, + the global variable optimization pass of LLVM tries to evaluate the global + variables with static constructors and promote them to global constants. Although + this optimization is correct, it may cause some incompatability with code compiled + by GCC. For example, code may do {@code const_cast} to cast the constant to mutable + and modify it. In GCC, the variable is in read-write and the code is run by + accident. In Clang, the const variable is in read-only memory and may cause your + application to crash.</li> + </ul> + </li> + <li>Added {@code -mldc1-sdc1} to the MIPS GCC and Clang compilers. By default, compilers + align 8-byte objects properly and emit the {@code ldc1} and {@code sdc1} instructions + to move them around. If your app uses a custom allocator that does not always align + with a new object's 8-byte boundary in the same way as the default allocator, your app + may crash due to {@code ldc1} and {@code sdc1} operations on unaligned memory. In this + case, use the {@code -mno-ldc1-sdc1} flag to workaround the problem.</li> + <li>Downgraded the event severity from warning to info if {@code APP_PLATFORM_LEVEL} is + larger than {@code APP_MIN_PLATFORM_LEVEL}. The {@code APP_PLATFORM_LEVEL} may be lower + than {@code APP_PLATFORM} in {@code jni/Application.mk} because the NDK does not have + headers for all levels. In this case, the actual level is shifted downwards. The + {@code APP_MIN_PLATFORM_LEVEL} is specified by the {@code android:minSdkVersion} in + your application's manifest. + (<a href="http://b.android.com/39752">Issue 39752</a>)</li> + <li>Added the {@code android_getCpuIdArm()} and {@code android_setCpuArm()} methods to + {@code cpu-features.c}. This addition enables easier retrieval of the ARM CPUID + information. (<a href="http://b.android.com/53689">Issue 53689</a>)</li> + <li>Modified {@code ndk-build} to use GCC 4.7's {@code as/ld} for Clang compiling. + <p class="note"><strong>Note:</strong> + In GCC 4.7, {@code monotonic_clock} and {@code is_monotonic} have been renamed to + {@code steady_clock} and {@code is_steady}, respectively.</p></li> + <li>Added the following new warnings to the {@code ndk-build} script: + <ul> + <li>Added warnings if {@code LOCAL_LDLIBS/LDFLAGS} are used in static library + modules.</li> + <li>Added a warning if a configuration has no module to build.</li> + <li>Added a warning for non-system libraries being used in + {@code LOCAL_LDLIBS/LDFLAGS} of a shared library or executable modules.</li> + </ul> + </li> + <li>Updated build scripts, so that if {@code APP_MODULES} is not defined and only static + libraries are listed in {@code Android.mk}, the script force-builds all of them. + (<a href="http://b.android.com/53502">Issue 53502</a>)</li> + <li>Updated {@code ndk-build} to support absolute paths in {@code LOCAL_SRC_FILES}.</li> + <li>Removed the {@code *-gdbtui} executables, which are duplicates of the {@code *-gdb} + executables with the {@code -tui} option enabled.</li> + <li>Updated the build scripts to warn you when the Edison Design Group (EDG) compiler + front-end turns {@code _STLP_HAS_INCLUDE_NEXT} back on. + (<a href="http://b.android.com/53646">Issue 53646</a>)</li> + <li>Added the environment variable {@code NDK_LIBS_OUT} to allow overriding of the + path for {@code libraries/gdbserver} from the default {@code $PROJECT/libs}. + For more information, see {@code OVERVIEW.html}.</li> + <li>Changed ndk-build script defaults to compile code with format string protection + {@code -Wformat -Werror=format-security}. You may set + {@code LOCAL_DISABLE_FORMAT_STRING_CHECKS=true} to disable it. + For more information, see {@code ANDROID-MK.html}</li> + <li>Added STL pretty-print support in {@code ndk-gdb-py}. For more information, see + {@code NDK-GDB.html}.</li> + <li>Added tests based on the googletest frameworks.</li> + <li>Added a notification to the toolchain build script that warns you if the current shell + is not {@code bash}.</li> + </ul> + </dd> + </dl> + </div> +</div> + + +<div class="toggle-content closed"> +<a name="lower"></a> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" + alt="">Android NDK, Revision 8e</a> <em>(March 2013)</em> + </p> + + <div class="toggle-content-toggleme"> + <dl> + <dt>Important changes:</dt> + <dd> + <ul> + <li>Added 64-bit host toolchain set (package name suffix {@code *-x86_64.*}). For more + information, see {@code CHANGES.HTML} and {@code NDK-BUILD.html}.</li> + <li>Added Clang 3.2 compiler. GCC 4.6 is still the default. For information on using the + Clang compiler, see {@code CHANGES.HTML}.</li> + <li>Added static code analyzer for Linux/MacOSX hosts. For information on using the + analyzer, see {@code CHANGES.HTML}.</li> + <li>Added MCLinker for Linux/MacOSX hosts as an experimental feature. The {@code ld.gold} + linker is the default where available, so you must explicitly enable it. For more + information, see {@code CHANGES.HTML}.</li> + <li>Updated ndk-build to use topological sort for module dependencies, which means the + build automatically sorts out the order of libraries specified in + {@code LOCAL_STATIC_LIBRARIES}, {@code LOCAL_WHOLE_STATIC_LIBRARIES} and + {@code LOCAL_SHARED_LIBRARIES}. For more information, see {@code CHANGES.HTML}. + (<a href="http://b.android.com/39378">Issue 39378</a>)</li> + </ul> + </dd> + + <dt>Important bug fixes:</dt> + <dd> + <ul> + <li>Fixed build script to build all toolchains in {@code -O2}. Toolchains in previous + releases were incorrectly built without optimization.</li> + <li>Fixed build script which unconditionally builds Clang/llvm for MacOSX in 64-bit.</li> + <li>Fixed GCC 4.6/4.7 internal compiler error: + {@code gen_thumb_movhi_clobber at config/arm/arm.md:5832}. + (<a href="http://b.android.com/52732">Issue 52732</a>)</li> + <li>Fixed build problem where GCC/ARM 4.6/4.7 fails to link code using 64-bit atomic + built-in functions. + (<a href="http://b.android.com/41297">Issue 41297</a>)</li> + <li>Fixed GCC 4.7 linker DIV usage mismatch errors. + (<a href="http://sourceware.org/ml/binutils/2012-12/msg00202.html">Sourceware Issue</a>) + <li>Fixed GCC 4.7 internal compiler error {@code build_data_member_initialization, at + cp/semantics.c:5790}.</li> + <li>Fixed GCC 4.7 internal compiler error {@code redirect_eh_edge_1, at tree-eh.c:2214}. + (<a href="http://b.android.com/52909">Issue 52909</a>)</li> + <li>Fixed a GCC 4.7 segfault. + (<a href="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=55245">GCC Issue</a>)</li> + <li>Fixed {@code <chrono>} clock resolution and enabled {@code steady_clock}. + (<a href="http://b.android.com/39680">Issue 39680</a>)</li> + <li>Fixed toolchain to enable {@code _GLIBCXX_HAS_GTHREADS} for GCC 4.7 libstdc++. + (<a href="http://b.android.com/41770">Issue 41770</a>, + <a href="http://b.android.com/41859">Issue 41859</a>)</li> + <li>Fixed problem with the X86 MXX/SSE code failing to link due to missing + {@code posix_memalign}. + (<a href="https://android-review.googlesource.com/#/c/51872">Change 51872</a>)</li> + <li>Fixed GCC4.7/X86 segmentation fault in {@code i386.c}, function + {@code distance_non_agu_define_in_bb()}. + (<a href="https://android-review.googlesource.com/#/c/50383">Change 50383</a>)</li> + <li>Fixed GCC4.7/X86 to restore earlier {@code cmov} behavior. + (<a href="http://gcc.gnu.org/viewcvs?view=revision&revision=193554">GCC Issue</a>)</li> + <li>Fixed handling NULL return value of {@code setlocale()} in libstdc++/GCC4.7. + (<a href="http://b.android.com/46718">Issue 46718</a>) + <li>Fixed {@code ld.gold} runtime undefined reference to {@code __exidx_start} and + {@code __exidx_start_end}. + (<a href="https://android-review.googlesource.com/#/c/52134">Change 52134</a>)</li> + <li>Fixed Clang 3.1 internal compiler error when using Eigen library. + (<a href="http://b.android.com/41246">Issue 41246</a>)</li> + <li>Fixed Clang 3.1 internal compiler error including {@code <chrono>} in C++11 +mode. + (<a href="http://b.android.com/39600">Issue 39600</a>)</li> + <li>Fixed Clang 3.1 internal compiler error when generating object code for a method + call to a uniform initialized {@code rvalue}. + (<a href="http://b.android.com/41387">Issue 41387</a>)</li> + <li>Fixed Clang 3.1/X86 stack realignment. + (<a href="https://android-review.googlesource.com/#/c/52154">Change 52154</a>)</li> + <li>Fixed problem with GNU Debugger (GDB) SIGILL when debugging on Android 4.1.2. + (<a href="http://b.android.com/40941">Issue 40941</a>)</li> + <li>Fixed problem where GDB cannot set {@code source:line} breakpoints when symbols +contain + long, indirect file paths. + (<a href="http://b.android.com/42448">Issue 42448</a>)</li> + <li>Fixed GDB {@code read_program_header} for MIPS PIE executables. + (<a href="https://android-review.googlesource.com/#/c/49592">Change 49592</a>)</li> + <li>Fixed {@code STLport} segmentation fault in {@code uncaught_exception()}. + (<a href="https://android-review.googlesource.com/#/c/50236">Change 50236</a>)</li> + <li>Fixed {@code STLport} bus error in exception handling due to unaligned access of + {@code DW_EH_PE_udata2}, {@code DW_EH_PE_udata4}, and {@code DW_EH_PE_udata8}.</li> + <li>Fixed Gabi++ infinite recursion problem with {@code nothrow new[]} operator. + (<a href="http://b.android.com/52833">Issue 52833</a>)</li> + <li>Fixed Gabi++ wrong offset to exception handler pointer. + (<a href="https://android-review.googlesource.com/#/c/53446">Change 53446</a>)</li> + <li>Removed Gabi++ redundant free on exception object + (<a href="https://android-review.googlesource.com/#/c/53447">Change 53447</a>)</li> + </ul> + </dd> + + <dt>Other bug fixes:</dt> + <dd> + <ul> + <li>Fixed NDK headers: + <ul> + <li>Removed redundant definitions of {@code size_t}, {@code ssize_t}, and + {@code ptrdiff_t}.</li> + <li>Fixed MIPS and ARM {@code fenv.h} header.</li> + <li>Fixed {@code stddef.h} to not redefine {@code offsetof} since it already exists + in the toolchain.</li> + <li>Fixed {@code elf.h} to contain {@code Elf32_auxv_t} and {@code Elf64_auxv_t}. + (<a href="http://b.android.com/38441">Issue 38441</a>) + </li> + <li>Fixed the {@code #ifdef} C++ definitions in the + {@code OpenSLES_AndroidConfiguration.h} header file. + (<a href="http://b.android.com/53163">Issue 53163</a>) + </li> + </ul> + </li> + <li>Fixed {@code STLport} to abort after out of memory error instead of silently exiting. + </li> + <li>Fixed system and Gabi++ headers to be able to compile with API level 8 and lower.</li> + <li>Fixed {@code cpufeatures} to not parse {@code /proc/self/auxv}. + (<a href="http://b.android.com/43055">Issue 43055</a>)</li> + <li>Fixed {@code ld.gold} to not depend on host libstdc++ and on Windows platforms, + to not depend on the {@code libgcc_sjlj_1.dll} library.</li> + <li>Fixed Clang 3.1 which emits inconsistent register list in {@code .vsave} and fails + assembler. + (<a href="https://android-review.googlesource.com/#/c/49930">Change 49930</a>)</li> + <li>Fixed Clang 3.1 to be able to compile libgabi++ and pass the {@code test-stlport} + tests for MIPS build targets. + (<a href="https://android-review.googlesource.com/#/c/51961">Change 51961</a>)</li> + <li>Fixed Clang 3.1 to only enable exception by default for C++, not for C.</li> + <li>Fixed several issues in Clang 3.1 to pass most GNU exception tests.</li> + <li>Fixed scripts {@code clang} and {@code clang++} in standalone NDK compiler to detect + {@code -cc1} and to not specify {@code -target} when found.</li> + <li>Fixed {@code ndk-build} to observe {@code NDK_APP_OUT} set in {@code Application.mk}. + </li> + <li>Fixed X86 {@code libc.so} and {@code lib.a} which were missing the {@code sigsetjmp} + and {@code siglongjmp} functions already declared in {@code setjmp.h}. + (<a href="http://b.android.com/19851">Issue 19851</a>)</li> + <li>Patched GCC 4.4.3/4.6/4.7 libstdc++ to work with Clang in C++ 11. + (<a href="http://clang.llvm.org/cxx_status.html">Clang Issue</a>)</li> + <li>Fixed cygwin path in argument passed to {@code HOST_AWK}.</li> + <li>Fixed {@code ndk-build} script warning in windows when running from project's JNI + directory. + (<a href="http://b.android.com/40192">Issue 40192</a>)</li> + <li>Fixed problem where the {@code ndk-build} script does not build if makefile has + trailing whitespace in the {@code LOCAL_PATH} definition. + (<a href="http://b.android.com/42841">Issue 42841</a>)</li> + </ul> + </dd> + + <dt>Other changes:</dt> + <dd> + <ul> + <li>Enabled threading support in GCC/MIPS toolchain.</li> + <li>Updated GCC exception handling helpers {@code __cxa_begin_cleanup} and + {@code __cxa_type_match} to have <em>default</em> visibility from the previous + <em>hidden</em> visibility in GNU libstdc++. For more information, see + {@code CHANGES.HTML}.</li> + <li>Updated build scripts so that Gabi++ and STLport static libraries are now built with + hidden visibility except for exception handling helpers.</li> + <li>Updated build so that {@code STLport} is built for ARM in Thumb mode.</li> + <li>Added support for {@code std::set_new_handler} in Gabi++. + (<a href="http://b.android.com/52805">Issue 52805</a>)</li> + <li>Enabled {@code FUTEX} system call in GNU libstdc++.</li> + <li>Updated {@code ndk-build} so that it no longer copies prebuilt static library to + a project's {@code obj/local/<abi>/} directory. + (<a href="http://b.android.com/40302">Issue 40302</a>)</li> + <li>Removed {@code __ARM_ARCH_5*__} from ARM {@code toolchains/*/setup.mk} script. + (<a href="http://b.android.com/21132">Issue 21132</a>)</li> + <li>Built additional GNU libstdc++ libraries in thumb for ARM.</li> + <li>Enabled MIPS floating-point {@code madd/msub/nmadd/nmsub/recip/rsqrt} + instructions with 32-bit FPU.</li> + <li>Enabled graphite loop optimizer in GCC 4.6 and 4.7 to allow more optimizations: + {@code -fgraphite}, {@code -fgraphite-identity}, {@code -floop-block}, {@code +-floop-flatten}, + {@code -floop-interchange}, {@code -floop-strip-mine}, {@code -floop-parallelize-all}, + and {@code -ftree-loop-linear}. + (<a href="http://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html">info</a>)</li> + <li>Enabled {@code polly} for Clang 3.1 on Linux and Max OS X 32-bit hosts which analyzes + and optimizes memory access. (<a href="http://polly.llvm.org">info</a>)</li> + <li>Enabled {@code -flto} in GCC 4.7, 4.6, Clang 3.2 and Clang 3.1 on linux (Clang LTO + via LLVMgold.so). MIPS compiler targets are not supported because {@code ld.gold} + is not available.</li> + <li>Enabled {@code --plugin} and {@code --plugin-opt} for {@code ld.gold} in GCC 4.6/4.7. + </li> + <li>Enabled {@code --text-reorder} for {@code ld.gold} in GCC 4.7.</li> + <li>Configured GNU libstdc++ with {@code _GLIBCXX_USE_C99_MATH} which undefines the + {@code isinf} script in the bionic header. For more information, see + {@code CHANGES.html}.</li> + <li>Added {@code APP_LDFLAGS} to the build scripts. For more information, see + {@code ANDROID-MK.html}.</li> + <li>Updated build scripts to allow {@code NDK_LOG=0} to disable the {@code NDK_LOG}.</li> + <li>Updated build scripts to allow {@code NDK_HOST_32BIT=0} to disable the host developer + environment 32-bit toolchain.</li> + <li>Changed the default GCC/X86 flags {@code -march=} and {@code -mtune=} from + {@code pentiumpro} and {@code generic} to {@code i686} and {@code atom}.</li> + <li>Enhanced toolchain build scripts: + <ul> + <li>Fixed a race condition in {@code build-gcc.sh} for the {@code mingw} build type + which was preventing a significant amount of parallel build processing.</li> + <li>Updated {@code build-gabi++.sh} and {@code build-stlport.sh} so they can now run + from the NDK package. + (<a href="http://b.android.com/52835">Issue 52835</a>) + </li> + <li>Fixed {@code run-tests.sh} in the {@code MSys} utilities collection.</li> + <li>Improved 64-bit host toolchain and Canadian Cross build support.</li> + <li>Updated {@code build-mingw64-toolchain.sh} script to more recent version.</li> + <li>Added option to build {@code libgnustl_static.a} and {@code stlport_static.a} + without hidden visibility.</li> + </ul> + </li> + </ul> + + </dd> + </dl> + </div> +</div> + + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" + alt="">Android NDK, Revision 8d</a> <em>(December 2012)</em> + </p> + + <div class="toggle-content-toggleme"> + <dl> + <dt>Important changes:</dt> + <dd> + <ul> + <li>Added the GNU Compiler Collection (GCC) 4.7 compiler to the NDK. The GCC 4.6 compiler + is still the default, so you must to explicitly enable the new version as follows: + <ul> + <li>For {@code ndk-build}, export the {@code NDK_TOOLCHAIN_VERSION=4.7} variable + <em>or</em> add it to {@code Application.mk}.</li> + <li>For standalone builds, add the {@code --toolchain=} option to + {@code make-standalone-toolchain.sh}, for example: + <pre>--toolchain=arm-linux-androideabi-4.7</pre></li> + </ul> + <p class="note"> + <strong>Note:</strong> This feature is experimental. Please try it and + <a href="http://code.google.com/p/android/issues/list">report any issues</a>.</p> + </li> + <li>Added {@code stlport} exception support via gabi++. Note that the new gabi++ + depends on {@code dlopen} and related code, meaning that: + <ul> + <li>You can no longer build a <em>static</em> executable using the {@code -static} + option or include {@code libstlport_static.a} using + {@code APP_STL := stlport_static}. (You can still use the {@code -static} option + with a standalone toolchain.) Compiling a <em>dynamic</em> executable using + {@code include $(BUILD_EXECUTABLE)} continues to work because the compiler + automatically adds the {@code -ldl} option.</li> + <li>If your project links using {@code -nostdlib} and {-Wl,--no-undefined}, you + must manually include the {@code -ldl} option.</li> + </ul> + For more information, see {@code CPLUSPLUS-SUPPORT.html}. + + <p class="note"> + <strong>Note:</strong> This feature is experimental and works better with the GCC + 4.6/4.7 compilers than with GCC 4.4.3 or Clang 3.1. Please try it and + <a href="http://code.google.com/p/android/issues/list">report any issues</a>.</p> + </li> + <li>Added a {@code -mstack-protector-guard=} option for x86 to choose between a + <em>global</em> default path which is compatible with older Android C library (bionic) + and a new <em>tls</em> path (%gs:20) for {@code -fstack-protector}, + {@code -fstack-protector-all} and {@code -fstack-protector-strong} using the GCC 4.6 + and higher compilers. + + <p class="note"> + <strong>Note:</strong> The {@code -mstack-protector-guard} setting itself does not + enable any {@code -fstack-protector*} options.</p> + </li> + <li>Added {@code android_setCpu()} function to + {@code sources/android/cpufeatures/cpu-features.c} for use when auto-detection via + {@code /proc} is not possible in Android 4.1 and higher. + (<a href="http://code.google.com/p/chromium/issues/detail?id=164154">Chromium Issue + 164154</a>)</li> + </ul> + </dd> + + <dt>Important bug fixes:</dt> + <dd> + <ul> + <li>Fixed unnecessary rebuild of object files when using the {@code ndk-build} script. + (<a href="http://b.android.com/39810">Issue 39810</a>)</li> + <li>Fixed a linker failure with the NDK 8c release for Mac OS X 10.6.x that produced the + following error: + <pre> +dyld: lazy symbol binding failed: Symbol not found: _memmem +Referenced from: ...../arm-linux-androideabi/bin/ld +Expected in: /usr/lib/libSystem.B.dylib</pre> + This problem was caused by building on Mac OS X 10.7, which produced binaries that were + not compatible with Mac OS 10.6.x and the NDK. + </li> + <li>Removed the {@code -x c++} options from the Clang++ standalone build script. + (<a href="http://b.android.com/39089">Issue 39089</a>)</li> + <li>Fixed issues using the {@code NDK_TOOLCHAIN_VERSION=clang3.1} option in Cygwin. + (<a href="http://b.android.com/39585">Issue 39585</a>)</li> + <li>Fixed the {@code make-standalone-toolchain.sh} script to allow generation of a + standalone toolchain using the Cygwin or MinGW environments. The resulting toolchain + can be used in Cygwin, MingGW or CMD.exe environments. + (<a href="http://b.android.com/39915">Issue 39915</a>, + <a href="http://b.android.com/39585">Issue 39585</a>)</li> + <li>Added missing {@code SL_IID_ANDROIDBUFFERQUEUESOURCE} option in android-14 builds for + ARM and X86. + (<a href="http://b.android.com/40625">Issue 40625</a>)</li> + <li>Fixed x86 CPU detection for the {@code ANDROID_CPU_X86_FEATURE_MOVBE} feature. + (<a href="http://b.android.com/39317">Issue 39317</a>)</li> + <li>Fixed an issue preventing the Standard Template Library (STL) from using C++ + sources that do not have a {@code .cpp} file extension.</li> + <li>Fixed GCC 4.6 ARM internal compiler error <em>at reload1.c:1061</em>. + (<a href="http://b.android.com/20862">Issue 20862</a>)</li> + <li>Fixed GCC 4.4.3 ARM internal compiler error <em>at emit-rtl.c:1954</em>. + (<a href="http://b.android.com/22336">Issue 22336</a>)</li> + <li>Fixed GCC 4.4.3 ARM internal compiler error <em>at postreload.c:396</em>. + (<a href="http://b.android.com/22345">Issue 22345</a>)</li> + <li>Fixed problem with GCC 4.6/4.7 skipping lambda functions. + (<a href="http://b.android.com/35933">Issue 35933</a>)</li> + </ul> + </dd> + + <dt>Other bug fixes:</dt> + <dd> + <ul> + <li>NDK header file fixes: + <ul> + <li>Fixed {@code __WINT_TYPE__} and {@code wint_t} to be the same type.</li> + <li>Corrected typo in {@code android/bitmap.h}. + (<a href="http://b.android.com/15134">Issue 15134</a>) + </li> + <li>Corrected typo in {@code errno.h}.</li> + <li>Added check for the presence of {@code __STDC_VERSION__} in {@code sys/cdefs.h}. + (<a href="http://b.android.com/14627">Issue 14627</a>) + </li> + <li>Reorganized headers in {@code byteswap.h} and {@code dirent.h}.</li> + <li>Fixed {@code limits.h} to include {@code page.h} which provides {@code PAGE_SIZE} + settings. + (<a href="http://b.android.com/39983">Issue 39983</a>) + </li> + <li>Fixed return type of {@code glGetAttribLocation()} and + {@code glGetUniformLocation()} from {@code int} to {@code GLint}.</li> + <li>Fixed {@code __BYTE_ORDER} constant for x86 builds. + (<a href="http://b.android.com/39824">Issue 39824</a>) + </li> + </ul> + </li> + <li>Fixed {@code ndk-build} script to not overwrite {@code -Os} with {@code -O2} for ARM + builds.</li> + <li>Fixed build scripts to allow overwriting of {@code HOST_AWK}, {@code HOST_SED}, and + {@code HOST_MAKE} settings.</li> + <li>Fixed issue for {@code ld.gold} on {@code fsck_msdos} builds linking objects built by + the Intel C/C++ compiler (ICC).</li> + <li>Fixed ARM EHABI support in Clang to conform to specifications.</li> + <li>Fixed GNU Debugger (GDB) to shorten the time spent on walking the target's link map + during {@code solib} events. + (<a href="http://b.android.com/38402">Issue 38402</a>)</li> + <li>Fixed missing {@code libgcc.a} file when linking shared libraries.</li> + </ul> + </dd> + + <dt>Other changes:</dt> + <dd> + <ul> + <li>Backported 64-bit built-in atomic functions for ARM to GCC 4.6.</li> + <li>Added documentation for audio output latency, along with other documentation and + fixes.</li> + <li>Fixed debug builds with Clang so that non-void functions now raise a {@code SIGILL} + signal for paths without a return statement.</li> + <li>Updated {@code make-standalone-toolchain.sh} to accept the suffix {@code -clang3.1} + which is equivalent to adding {@code --llvm-version=3.1} to the GCC 4.6 toolchain.</li> + <li>Updated GCC and Clang bug report URL to: + <a +href="http://source.android.com/source/report-bugs.html">http://source.android.com/source/report-bug +s.html</a></li> + <li>Added ARM ELF support to {@code llvm-objdump}.</li> + <li>Suppressed <em>treating c input as c++</em> warning for Clang builds.</li> + <li>Updated build so that only the 32-bit version of {@code libiberty.a} is built and + placed in {@code lib32/}.</li> + </ul> + </dd> + </dl> + </div> +</div> + + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" + alt="">Android NDK, Revision 8c</a> <em>(November 2012)</em> + </p> + + <div class="toggle-content-toggleme"> + <dl> + <dt>Important changes:</dt> + + <dd> + <ul> + <li>Added the Clang 3.1 compiler to the NDK. The GNU Compiler Collection (GCC) 4.6 is + still the default, so you must explicitly enable the Clang compiler option as follows: + <ul> + <li>For {@code ndk-build}, export {@code NDK_TOOLCHAIN_VERSION=clang3.1} <em>or</em> + add this environment variable setting to {@code Application.mk}.</li> + <li>For standalone builds, add {@code --llvm-version=3.1} to + {@code make-standalone-toolchain.sh} and replace {@code CC} and {@code CXX} in your + makefile with {@code <tool-path>/bin/clang} and + {@code <tool-path>/bin/clang++}. See {@code STANDALONE-TOOLCHAIN.html} for + details.</li> + </ul> + <p class="note"><strong>Note:</strong> This feature is experimental. Please try it and + <a href="http://code.google.com/p/android/issues/list">report any issues</a>.</p></li> + <li>Added Gold linker {@code ld.gold} for the Windows toolchain. Gold linker is also the + default for ARM and X86 on all hosts. You may override it to use the {@code ld.bfd} + linker by adding {@code LOCAL_LDFLAGS += -fuse-ld=bfd} to {@code Android.mk}, or by +passing + {@code -fuse-ld=bfd} to the g++/clang++ command line that does the linking.</li> + <li>Added checks for spaces in the NDK path to the {@code ndk-build[.cmd]} and + {@code ndk-gdb} scripts, to prevent build errors that are difficult to diagnose.</li> + <li>Made the following changes to API level handling: + <ul> + <li>Modified build logic so that projects that specify {@code android-10} through + {@code android-13} in {@code APP_PLATFORM}, {@code project.properties} or + {@code default.properties} link against {@code android-9} instead of + {@code android-14}. + <li>Updated build so that executables using android-16 (Jelly Bean) or higher are + compiled with the {@code -fPIE} option for position-independent executables (PIE). + A new {@code APP_PIE} option allows you to control this behavior. See {@code + APPLICATION-MK.html} for details. + <p class="note"> + <strong>Note:</strong> All API levels above 14 still link against {@code + platforms/android-14} and no new {@code platforms/android-N} have been added. + </p></li> + <li>Modified {@code ndk-build} to provide warnings if the adjusted API level is larger + than {@code android:minSdkVersion} in the project's {@code AndroidManifest.xml}.</li> + </ul> + </li> + <li>Updated the {@code cpu-features} helper library to include more ARM-specific features. + See {@code sources/android/cpufeatures/cpu-features.h} for details.</li> + <li>Modified the long double on the X86 platform to be 8 bytes. This data type is now the + same size as a double, but is still treated as a distinct type.</li> + <li>Updated build for {@code APP_ABI=armeabi-v7a}: + <ul> + <li>Modified this build type to pass the {@code -march=armv7-a} parameter + to the linker. This change ensures that v7-specific libraries and {@code crt*.o} are + linked correctly.</li> + <li>Added {@code -mfpu=vfpv3-d16} to {@code ndk-build} instead of the + {@code -mfpu=vfp} option used in previous releases.</li> + </ul> + </li> + </ul> + </dd> + </dl> + + <dl> + <dt>Important bug fixes:</dt> + + <dd> + <ul> + <li>Fixed an issue where running {@code make-standalone-toolchain.sh} with root privileges + resulted in the stand alone tool chain being inaccessible to some users. + (<a href="http://b.android.com/35279">Issue 35279</a>) + <ul> + <li>All files and executables in the NDK release package are set to have read and + execute permissions for all.</li> + <li>The ownership/group of {@code libstdc++.a} is now preserved when copied.</li> + </ul> + </li> + <li>Removed redundant {@code \r} from Windows prebuilt {@code echo.exe}. The redundant + {@code \r} caused {@code gdb.setup} to fail in the GNU Debugger (GDB) because it + incorrectly became part of the path. + (<a href="http://b.android.com/36054">Issue 36054</a>)</li> + <li>Fixed Windows parallel builds that sometimes failed due to timing issues in the + {@code host-mkdir} implementation. + (<a href="http://b.android.com/25875">Issue 25875</a>)</li> + <li>Fixed GCC 4.4.3 GNU {@code libstdc++} to <em>not</em> merge {@code typeinfo} names by + default. For more details, see + {@code toolchain repo gcc/gcc-4.4.3/libstdc++-v3/libsupc++/typeinfo}. + (<a href="http://b.android.com/22165">Issue 22165</a>)</li> + <li>Fixed problem on {@code null} context in GCC 4.6 + {@code cp/mangle.c::write_unscoped_name}, where GCC may crash when the context is + {@code null} and dereferenced in {@code TREE_CODE}.</li> + <li>Fixed GCC 4.4.3 crashes on ARM NEON-specific type definitions for floats. + (<a href="http://b.android.com/34613">Issue 34613</a>)</li> + <li>Fixed the {@code STLport} internal {@code _IteWrapper::operator*()} implementation + where a stale stack location holding the dereferenced value was returned and caused + runtime crashes. + (<a href="http://b.android.com/38630">Issue 38630</a>)</li> + + <li>ARM-specific fixes: + <ul> + <li>Fixed ARM GCC 4.4.3/4.6 {@code g++} to not warn that the <em>mangling of + <va_list> was changed in GCC 4.4</em>. The workaround using the + {@code -Wno-psabi} switch to avoid this warning is no longer required.</li> + <li>Fixed an issue when a project with {@code .arm} or {@code .neon} suffixes in + {@code LOCAL_SRC_FILES} also used {@code APP_STL}. With {@code APP_STL}, the + {@code ndk-build} script searches for C++ files in {@code LOCAL_SRC_FILES} before + adding STL {@code header/lib} paths to compilation. Modified {@code ndk-build} to + filter out {@code .arm} and {@code .neon} suffixes before the search, otherwise items + in {@code LOCAL_SRC_FILES} like {@code myfile.cpp.arm.neon} won't be compiled as C++ + code.</li> + <li>Fixed {@code binutils-2.21/ld.bfd} to be capable of linking object from older + binutils without {@code tag_FP_arch}, which was producing <em>assertion fail</em> + error messages in GNU Binutils. + (<a href="http://b.android.com/35209">Issue 35209</a>) + </li> + <li>Removed <em>Unknown EABI object attribute 44</em> warning when + {@code binutils-2.19/ld} links prebuilt object by newer {@code binutils-2.21}</li> + <li>Fixed an issue in GNU {@code stdc++} compilation with both {@code -mthumb} and + {@code -march=armv7-a}, by modifying {@code make-standalone-toolchain.sh} to populate + {@code headers/libs} in sub-directory {@code armv7-a/thumb}. + (<a href="http://b.android.com/35616">Issue 35616</a>) + </li> + <li>Fixed <em>unresolvable R_ARM_THM_CALL relocation</em> error. + (<a href="http://b.android.com/35342">Issue 35342</a>) + </li> + <li>Fixed internal compiler error at {@code reload1.c:3633}, caused by the ARM + back-end expecting the wrong operand type when sign-extend from {@code char}. + (<a href="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50099">GCC Issue 50099</a>)</li> + <li>Fixed internal compiler error with negative shift amount. + (<a href="http://gcc.gnu.org/ml/gcc-patches/2011-10/msg00594.html">GCC Issue</a>)</li> + </ul> + </li> + + <li>Fixed {@code -fstack-protector} for X86, which is also the default for the + {@code ndk-build} x86 ABI target.</li> + + <li>MIPS-specific fixes: + <ul> + <li>Fixed {@code STLport} endian-ness by setting {@code _STLP_LITTLE_ENDIAN} to 1 when + compiling MIPS {@code libstlport_*}.</li> + <li>Fixed GCC {@code __builtin_unreachable} issue when compiling LLVM. + (<a href="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54369">GCC Issue 54369</a>)</li> + <li>Backported fix for {@code cc1} compile process consuming 100% CPU. + (<a href="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50380">GCC Issue 50380</a>)</li> + </ul> + </li> + + <li>GNU Debugger-specific fixes: + <ul> + <li>Disabled Python support in gdb-7.x at build, otherwise the gdb-7.x configure + function may pick up whatever Python version is available on the host and build + {@code gdb} with a hard-wired dependency on a specific version of Python. + (<a href="http://b.android.com/36120">Issue 36120</a>) + </li> + <li>Fixed {@code ndk-gdb} when {@code APP_ABI} contains {@code all} and matchs none + of the known architectures. + (<a href="http://b.android.com/35392">Issue 35392</a>) + </li> + <li>Fixed Windows pathname support, by keeping the {@code :} character if it looks + like it could be part of a Windows path starting with a drive letter. + (<a href="http://sourceware.org/bugzilla/show_bug.cgi?id=12843">GDB Issue 12843</a>) + </li> + <li>Fixed adding of hardware breakpoint support for ARM in {@code gdbserver}. + (<a href="http://sourceware.org/ml/gdb-patches/2011-09/msg00200.html">GDB Issue</a>) + </li> + <li>Added fix to only read the current {@code solibs} when the linker is consistent. + This change speeds up {@code solib} event handling. + (<a href="http://b.android.com/37677">Issue 37677</a>) + </li> + <li>Added fix to make repeated attempts to find {@code solib} breakpoints. GDB now + retries {@code enable_break()} during every call to {@code svr4_current_sos()} until + it succeeds. + (<a href="https://android-review.googlesource.com/#/c/43563">Change 43563</a>)</li> + <li>Fixed an issue where {@code gdb} would not stop on breakpoints placed in + {@code dlopen-ed} libraries. + (<a href="http://b.android.com/34856">Issue 34856</a>) + </li> + <li>Fixed {@code SIGILL} in dynamic linker when calling {@code dlopen()}, on system + where {@code /system/bin/linker} is stripped of symbols and + {@code rtld_db_dlactivity()} is implemented as {@code Thumb}, due to not preserving + {@code LSB} of {@code sym_addr}. + (<a href="http://b.android.com/37147">Issue 37147</a>) + </li> + </ul> + </li> + </ul> + </dd> + </dl> + + <dl> + <dt>Other bug fixes:</dt> + + <dd> + <ul> + <li>Fixed NDK headers: + <ul> + <li>Fixed {@code arch-mips/include/asm/*} code that was incorrectly removed from + original kernel. (<a href="https://android-review.googlesource.com/#/c/43335">Change + 43335</a>)</li> + <li>Replaced struct member data {@code __unused} with {@code __linux_unused} in + {@code linux/sysctl.h} and {@code linux/icmp.h} to avoid conflict with + {@code #define __unused} in {@code sys/cdefs.h}.</li> + <li>Fixed {@code fenv.h} for enclosed C functions with {@code __BEGIN_DECLS} and + {@code __END_DECLS}.</li> + <li>Removed unimplemented functions in {@code malloc.h}.</li> + <li>Fixed {@code stdint.h} defintion of {@code uint64_t} for ANSI compilers. + (<a href="http://b.android.com/1952">Issue 1952</a>)</li> + <li>Fixed preprocessor macros in {@code <arch>/include/machine/*}.</li> + <li>Replaced {@code link.h} for MIPS with new version supporting all platforms.</li> + <li>Removed {@code linux-unistd.h}</li> + <li>Move GLibc-specific macros {@code LONG_LONG_MIN}, {@code LONG_LONG_MAX} and + {@code ULONG_LONG_MAX} from {@code <pthread.h>} to {@code +<limits.h>}.</li> + </ul> + </li> + <li>Fixed a buffer overflow in {@code ndk-stack-parser}.</li> + <li>Fixed {@code _STLP_USE_EXCEPTIONS}, when not defined, to omit all declarations + and uses of {@code __Named_exception}. Compiling and use of {@code __Named_exception} + settings only occurs when {@code STLport} is allowed to use exceptions.</li> + <li>Fixed building of Linux-only NDK packages without also building Windows code. Use the + following settings to perform this type of build: + <pre>./build/tools/make-release.sh --force --systems=linux-x86</pre></li> + <li>Fixed {@code libc.so} so it does not export {@code atexit()} and {@code __do_handler}. + These symbols are exported for ARM builds by the system version of the C library to + support legacy native libraries. NDK-generated should never reference them directly. + Instead, each shared library or executable should embed its own version of these symbols, + provided by {@code crtbegin_*.o}. + <p>If your project is linked with the {@code -nostdlib -Wl,--no-undefined} options, you + must provide your own {@code __dso_handle} because {@code crtbegin_so.o} is not linked in + this case. The content of {@code __dso_handle} does not matter, as shown in the following + example code:</p> +<pre> +extern "C" { + extern void *__dso_handle __attribute__((__visibility__ ("hidden"))); + void *__dso_handle; +} +</pre> + </li> + <li>Fixed symbol decoder for ARM used in {@code objdump} for {@code plt} entries to + generate a more readable form {@code function@plt}.</li> + <li>Removed the following symbols, introduced in GCC 4.6 {@code libgcc.a}, from + the X86 platform {@code libc.so} library: {@code __aeabi_idiv0}, {@code __aeabi_ldiv0}, + {@code __aeabi_unwind_cpp_pr1}, and {@code __aeabi_unwind_cpp_pr2}.</li> + <li>Removed unused {@code .ctors}, {@code .dtors}, and {@code .eh_frame} in MIPS + {@code crt*_so.S}.</li> + <li>Updated {@code ndk-gdb} so that it only takes the last line of output for + {@code ndk-build} {@code DUMP_XXXX}. This change ensures that if {@code Application.mk} or + {@code Android.mk} print something with {@code $(info ...)} syntax, it does not get + injected into the result of {@code DUMP_XXXX}. + (<a href="https://groups.google.com/d/msg/android-ndk/-/ew0lTWGr1UEJ">More info</a>)</li> + </ul> + </dd> + </dl> + + <dl> + <dt>Other changes:</dt> + + <dd> + <ul> + <li>Removed {@code arch-x86} and {@code arch-mips} headers from + {@code platforms/android-[3,4,5,8]}. Those headers were incomplete, since both X86 and + MIPS ABIs are only supported at API 9 or higher.</li> + <li>Simplified c++ include path in standalone packages, as shown below. + (<a href="http://b.android.com/35279">Issue 35279</a>) +<pre> +<path>/arm-linux-androideabi/include/c++/4.6.x-google + to: +<path>/include/c++/4.6/ +</pre></li> + <li>Fixed {@code ndk-build} to recognize more C++ file extensions by default: + {@code .cc .cp .cxx .cpp .CPP .c++ .C}. You may still use {@code LOCAL_CPP_EXTENSION} to + overwrite these extension settings.</li> + <li>Fixed an issue in {@code samples/san-angeles} that caused a black screen or freeze + frame on re-launch.</li> + <li>Replaced deprecated APIs in NDK samples. + (<a href="http://b.android.com/20017">Issue 20017</a>) + <ul> + <li>{@code hello-gl2} from android-5 to android-7</li> + <li>{@code native-activity} from android-9 to android-10</li> + <li>{@code native-audio} from android-9 to android-10</li> + <li>{@code native-plasma} from android-9 to android-10</li> + </ul> + </li> + <li>Added new branding for Android executables with a simpler scheme in section + {@code .note.android.ident} (defined in {@code crtbegin_static/dynamic.o}) so that + debugging tools can act accordingly. The structure member and values are defined as + follows: +<pre> +static const struct { + int32_t namesz; /* = 8, sizeof ("Android") */ + int32_t descsz; /* = 1 * sizeof(int32_t) */ + int32_t type; /* = 1, ABI_NOTETYPE */ + char name[sizeof "Android"]; /* = "Android" */ + int32_t android_api; /* = 3, 4, 5, 8, 9, 14 */ +} +</pre> + <p>The previous branding options in section {@code .note.ABI-tag} are deprecated.</p> + </li> + <li>Added a new script {@code run-tests-all.sh} which calls {@code run-tests.sh} and + {@code standalone/run.sh} with various conditions. The script {@code run-tests.sh} runs + without the {@code --abi} option, and is enhanced to compile most of the tests for all + supported ABIs and run on all attached devices</li> + </ul> + </dd> + </dl> + + </div> +</div> + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" + alt="">Android NDK, Revision 8b</a> <em>(July 2012)</em> + </p> + + <div class="toggle-content-toggleme"> + <p>The main features of this release are a new GNU Compiler Collection (GCC) 4.6 toolchain and +GNU Debugger (GDB) 7.3.x which adds debugging support for the Android 4.1 (API Level 16) system +image.</p> + + <dl> + <dt>Important bug fixes:</dt> + + <dd> + <ul> + <li>Fixed {@code LOCAL_SHORT_COMMANDS} issues on Mac OS, Windows Cygwin environments for +static libraries. List file generation is faster, and it is not regenerated to avoid repeated +project rebuilds.</li> + <li>Fixed several issues in {@code ndk-gdb}: + <ul> + <li>Updated tool to pass flags {@code -e}, {@code -d} and {@code -s} to adb more +consistently.</li> + <li>Updated tool to accept device serial names containing spaces.</li> + <li>Updated tool to retrieve {@code /system/bin/link} information, so {@code gdb} on +the host can set a breakpoint in {@code __dl_rtld_db_dlactivity} and be aware of linker activity +(e.g., rescan {@code solib} symbols when {@code dlopen()} is called).</li> + </ul> + </li> + <li>Fixed {@code ndk-build clean} on Windows, which was failing to remove +{@code ./libs/*/lib*.so}.</li> + <li>Fixed {@code ndk-build.cmd} to return a non-zero {@code ERRORLEVEL} when {@code make} +fails.</li> + <li>Fixed {@code libc.so} to stop incorrectly exporting the {@code __exidx_start} and +{@code __exidx_end} symbols.</li> + <li>Fixed {@code SEGV} when unwinding the stack past {@code __libc_init} for ARM and +MIPS.</li> + </ul> + </dd> + </dl> + + <dl> + <dt>Important changes:</dt> + + <dd> + <ul> + <li>Added GCC 4.6 toolchain ({@code binutils} 2.21 with {@code gold} and GDB 7.3.x) to +co-exist with the original GCC 4.4.3 toolchain ({@code binutils} 2.19 and GDB 6.6). + <ul> + <li>GCC 4.6 is now the default toolchain. You may set {@code +NDK_TOOLCHAIN_VERSION=4.4.3} in {@code Application.mk} to select the original one.</li> + <li>Support for the {@code gold} linker is only available for ARM and x86 +architectures on Linux and Mac OS hosts. This support is disabled by default. Add {@code +LOCAL_LDLIBS += -fuse-ld=gold} in {@code Android.mk} to enable it.</li> + <li>Programs compiled with {@code -fPIE} require the new {@code GDB} for debugging, +including binaries in Android 4.1 (API Level 16) system images.</li> + <li>The {@code binutils} 2.21 {@code ld} tool contains back-ported fixes from +version 2.22: + <ul> + <li>Fixed {@code ld --gc-sections}, which incorrectly retains zombie references to +external libraries. (<a href="http://sourceware.org/bugzilla/show_bug.cgi?id=13177">more +info</a>).</li> + <li>Fixed ARM {@code strip} command to preserve the original {@code p_align} and +{@code p_flags} in {@code GNU_RELRO} section if they are valid. Without this fix, programs +built with {@code -fPIE} could not be debugged. (<a +href="http://sourceware.org/cgi-bin/cvsweb.cgi/src/bfd/elf.c.diff?cvsroot=src&r1=1.552&r2=1.553">mor +e info</a>)</li> + </ul> + </li> + <li>Disabled {@code sincos()} optimization for compatibility with older + platforms.</li> + </ul> + </li> + + <li>Updated build options to enable the Never eXecute (NX) bit and {@code relro}/{@code +bind_now} protections by default: + <ul> + <li>Added {@code --noexecstack} to assembler and {@code -z noexecstack} to linker +that provides NX protection against buffer overflow attacks by enabling NX bit on stack and +heap.</li> + <li>Added {@code -z relro} and {@code -z now} to linker for hardening of internal +data sections after linking to guard against security vulnerabilities caused by memory corruption. +(more info: <a href="http://www.akkadia.org/drepper/nonselsec.pdf">1</a>, +<a href="http://tk-blog.blogspot.com/2009/02/relro-not-so-well-known-memory.html">2</a>)</li> + + <li>These features can be disabled using the following options: + <ol> + <li>Disable NX protection by setting the {@code --execstack} option for the +assembler and {@code -z execstack} for the linker.</li> + <li>Disable hardening of internal data by setting the {@code -z norelro} and +{@code -z lazy} options for the linker.</li> + <li>Disable these protections in the NDK {@code jni/Android.mk} by setting the +following options: +<pre> +LOCAL_DISABLE_NO_EXECUTE=true # disable "--noexecstack" and "-z noexecstack" +DISABLE_RELRO=true # disable "-z relro" and "-z now" +</pre> + </li> + </ol> + <p>See {@code docs/ANDROID-MK.html} for more details.</p> + </li> + </ul> + </li> + + <li>Added branding for Android executables with the {@code .note.ABI-tag} section (in +{@code crtbegin_static/dynamic.o}) so that debugging tools can act accordingly. The structure +member and values are defined as follows: +<pre> +static const struct { + int32_t namesz; /* = 4, sizeof ("GNU") */ + int32_t descsz; /* = 6 * sizeof(int32_t) */ + int32_t type; /* = 1 */ + char name[sizeof "GNU"]; /* = "GNU" */ + int32_t os; /* = 0 */ + int32_t major; /* = 2 */ + int32_t minor; /* = 6 */ + int32_t teeny; /* = 15 */ + int32_t os_variant; /* = 1 */ + int32_t android_api; /* = 3, 4, 5, 8, 9, 14 */ +}</pre> + </li> + </ul> + </dd> + </dl> + + <dl> + <dt>Other bug fixes:</dt> + + <dd> + <ul> + <li>Fixed {@code mips-linux-gnu} relocation truncated to fit {@code R_MIPS_TLS_LDM} issue. + (<a href="http://sourceware.org/bugzilla/show_bug.cgi?id=12637">more info</a>)</li> + <li>Fixed {@code ld} tool segfaults when using {@code --gc-sections}. + (<a href="http://sourceware.org/bugzilla/show_bug.cgi?id=12845">more info</a>) + </li> + <li>Fixed MIPS {@code GOT_PAGE} counting issue. + (<a href="http://sourceware.org/ml/binutils/2011-05/msg00198.html">more info</a>)</li> + <li>Fixed follow warning symbol link for {@code mips_elf_count_got_symbols}.</li> + <li>Fixed follow warning symbol link for {@code mips_elf_allocate_lazy_stub}.</li> + <li>Moved MIPS {@code .dynamic} to the data segment, so that it is writable.</li> + <li>Replaced hard-coded values for symbols with correct segment sizes for MIPS.</li> + <li>Removed the {@code -mno-shared} option from the defaults in the MIPS toolchain. +The default for Android toolchain is {@code -fPIC} (or {@code -fpic} if supported). If you do not +explicitly specify {@code -mshared}, {@code -fpic}, {@code -fPIC}, {@code -fpie}, or {@code -fPIE}, +the MIPS compiler adds {@code -mno-shared} that turns off PIC. Fixed compiler not to add +{@code -mno-shared} in this case.</li> + <li>Fixed wrong package names in samples {@code hello-jni} and {@code two-libs} so that +the {@code tests} project underneath it can compile.</li> + </ul> + </dd> + </dl> + + <dl> + <dt>Other Changes:</dt> + + <dd> + <ul> + <li>Changed locations of binaries: + <ul> + <li>Moved {@code gdbserver} from +{@code toolchain/<arch-os-ver>/prebuilt/gdbserver} to +{@code prebuilt/android-<arch>/gdbserver/gdbserver}.</li> + <li>Renamed x86 toolchain prefix from {@code i686-android-linux-} to +{@code i686-linux-android-}.</li> + <li>Moved {@code sources/cxx-stl/gnu-libstdc++/include} and {@code lib} to +{@code sources/cxx-stl/gnu-libstdc++/4.6} when compiled with GCC 4.6, or +{@code sources/cxx-stl/gnu-libstdc++/4.4.3} when compiled with GCC 4.4.3.</li> + <li>Moved {@code libbfd.a} and {@code libintl.a} from {@code lib/} to {@code +lib32/}.</li> + </ul> + </li> + + <li>Added and improved various scripts in the rebuild and test NDK toolchain: + <ul> + <li>Added {@code build-mingw64-toolchain.sh} to generate a new Linux-hosted toolchain +that generates Win32 and Win64 executables.</li> + <li>Improved speed of {@code download-toolchain-sources.sh} by using the {@code +clone} command and only using {@code checkout} for the directories that are needed to build the NDK +toolchain binaries.</li> + <li>Added {@code build-host-gcc.sh} and {@code build-host-gdb.sh} scripts.</li> + <li>Added {@code tests/check-release.sh} to check the content of a given NDK +installation directory, or an existing NDK package.</li> + <li>Rewrote the {@code tests/standalone/run.sh} standalone tests .</li> + </ul> + </li> + <li>Removed {@code if_dl.h} header from all platforms and architectures. The {@code +AF_LINK} and {@code sockaddr_dl} elements it describes are specific to BSD (i.e., they don't exist +in Linux).</li> + </ul> + </dd> + </dl> + + </div> +</div> + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" + alt="">Android NDK, Revision 8</a> <em>(May 2012)</em> + </p> + + <div class="toggle-content-toggleme"> + <p>This release of the NDK includes support for MIPS ABI and a few additional fixes.</p> + + <dl> + <dt>New features:</dt> + + <dd> + <ul> + <li>Added support for the MIPS ABI, which allows you to generate machine code that runs on + compatible MIPS-based Android devices. Major features for MIPS include MIPS-specific + toolchains, system headers, libraries and debugging support. For more details regarding + MIPS support, see {@code docs/CPU-MIPS.html} in the NDK package. + + <p>By default, code is generated for ARM-based devices. You can add {@code mips} to + your {@code APP_ABI} definition in your {@code Application.mk} file to build + for MIPS platforms. For example, the following line instructs {@code ndk-build} + to build your code for three distinct ABIs:</p> + + <pre>APP_ABI := armeabi armeabi-v7a <strong>mips</strong></pre> + + <p>Unless you rely on architecture-specific assembly sources, such as ARM assembly + code, you should not need to touch your {@code Android.mk} files to build MIPS + machine code.</p> + </li> + + <li>You can build a standalone MIPS toolchain using the {@code --arch=mips} + option when calling <code>make-standalone-toolchain.sh</code>. See + {@code docs/STANDALONE-TOOLCHAIN.html} for more details. + </li> + </ul> + + <p class="note"><strong>Note:</strong> To ensure that your applications are available +to users only if their devices are capable of running them, Google Play filters applications based +on the instruction set information included in your application ? no action is needed on your part +to enable the filtering. Additionally, the Android system itself also checks your application at +install time and allows the installation to continue only if the application provides a library that +is compiled for the device's CPU architecture.</p> + </dd> + + <dt>Important bug fixes:</dt> + + <dd> + <ul> + <li>Fixed a typo in GAbi++ implementation where the result of {@code + dynamic_cast<D>(b)} of base class object {@code b} to derived class {@code D} is + incorrectly adjusted in the opposite direction from the base class. + (<a href="http://b.android.com/28721">Issue 28721</a>) + </li> + <li>Fixed an issue in which {@code make-standalone-toolchain.sh} fails to copy + {@code libsupc++.*}.</li> + </ul> + </dd> + + <dt>Other bug fixes:</dt> + + <dd> + <ul> + <li>Fixed {@code ndk-build.cmd} to ensure that {@code ndk-build.cmd} works correctly even + if the user has redefined the {@code SHELL} environment variable, which may be changed + when installing a variety of development tools in Windows environments. + </li> + </ul> + </dd> + </dl> + </div> +</div> + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" + alt="">Android NDK, Revision 7c</a> <em>(April 2012)</em> + </p> + + <div class="toggle-content-toggleme"> + <p>This release of the NDK includes an important fix for Tegra2-based devices, and a few +additional fixes and improvements:</p> + + <dl> + <dt>Important bug fixes:</dt> + + <dd> + <ul> + <li>Fixed GNU STL armeabi-v7a binaries to not crash on non-NEON + devices. The files provided with NDK r7b were not configured properly, + resulting in crashes on Tegra2-based devices and others when trying to use + certain floating-point functions (e.g., {@code cosf}, {@code sinf}, {@code expf}).</li> + </ul> + </dd> + + <dt>Important changes:</dt> + + <dd> + <ul> + <li>Added support for custom output directories through the {@code NDK_OUT} + environment variable. When defined, this variable is used to store all + intermediate generated files, instead of {@code $PROJECT_PATH/obj}. The variable is + also recognized by {@code ndk-gdb}. </li> + <li>Added support for building modules with hundreds or even thousands of source + files by defining {@code LOCAL_SHORT_COMMANDS} to {@code true} in your {@code Android.mk}. + <p>This change forces the NDK build system to put most linker or archiver options + into list files, as a work-around for command-line length limitations. + See {@code docs/ANDROID-MK.html} for details.</p> + </li> + </ul> + </dd> + + <dt>Other bug fixes:</dt> + + <dd> + <ul> + <li>Fixed {@code android_getCpuCount()} implementation in the {@code cpufeatures} +helper library. On certain devices, where cores are enabled dynamically by the system, the previous +implementation would report the total number of <em>active</em> cores the first time the function +was called, rather than the total number of <em>physically available</em> cores.</li> + </ul> + </dd> + </dl> + </div> +</div> + + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" + alt="">Android NDK, Revision 7b</a> <em>(February 2012)</em> + </p> + + <div class="toggle-content-toggleme"> + <p>This release of the NDK includes fixes for native Windows builds, Cygwin and many other + improvements:</p> + + <dl> + <dt>Important bug fixes:</dt> + + <dd> + <ul> + <li>Updated {@code sys/atomics.h} to avoid correctness issues + on some multi-core ARM-based devices. Rebuild your unmodified sources with this + version of the NDK and this problem should be completely eliminated. + For more details, read {@code docs/ANDROID-ATOMICS.html}.</li> + <li>Reverted to {@code binutils} 2.19 to fix debugging issues that + appeared in NDK r7 (which switched to {@code binutils} 2.20.1).</li> + <li>Fixed {@code ndk-build} on 32-bit Linux. A packaging error put a 64-bit version + of the {@code awk} executable under {@code prebuilt/linux-x86/bin} in NDK r7.</li> + <li>Fixed native Windows build ({@code ndk-build.cmd}). Other build modes were not + affected. The fixes include: + <ul> + <li>Removed an infinite loop / stack overflow bug that happened when trying + to call {@code ndk-build.cmd} from a directory that was <em>not</em> the top of + your project path (e.g., in any sub-directory of it).</li> + <li>Fixed a problem where the auto-generated dependency files were ignored. This + meant that updating a header didn't trigger recompilation of sources that included + it.</li> + <li>Fixed a problem where special characters in files or paths, other than spaces and + quotes, were not correctly handled.</li> + </ul> + </li> + <li>Fixed the standalone toolchain to generate proper binaries when using + {@code -lstdc++} (i.e., linking against the GNU {@code libstdc++} C++ runtime). You + should use {@code -lgnustl_shared} if you want to link against the shared library + version or {@code -lstdc++} for the static version. + + <p>See {@code docs/STANDALONE-TOOLCHAIN.html} for more details about this fix.</p> + </li> + <li>Fixed {@code gnustl_shared} on Cygwin. The linker complained that it couldn't find + {@code libsupc++.a} even though the file was at the right location.</li> + <li>Fixed Cygwin C++ link when not using any specific C++ runtime through + {@code APP_STL}.</li> + </ul> + </dd> + </dl> + + <dl> + <dt>Other changes:</dt> + + <dd> + <ul> + <li>When your application uses the GNU {@code libstdc++} runtime, the compiler will + no longer forcibly enable exceptions and RTTI. This change results in smaller code. + <p>If you need these features, you must do one of the following:</p> + <ul> + <li>Enable exceptions and/or RTTI explicitly in your modules or + {@code Application.mk}. (recommended)</li> + <li>Define {@code APP_GNUSTL_FORCE_CPP_FEATURES} to {@code 'exceptions'}, + {@code 'rtti'} or both in your {@code Application.mk}. See + {@code docs/APPLICATION-MK.html} for more details.</li> + </ul> + </li> + <li>{@code ndk-gdb} now works properly when your application has private services + running in independent processes. It debugs the main application process, instead of the + first process listed by {@code ps}, which is usually a service process.</li> + <li>Fixed a rare bug where NDK r7 would fail to honor the {@code LOCAL_ARM_MODE} value + and always compile certain source files (but not all) to 32-bit instructions.</li> + <li>{@code STLport}: Refresh the sources to match the Android platform version. This + update fixes a few minor bugs: + <ul> + <li>Fixed instantiation of an incomplete type</li> + <li>Fixed minor "==" versus "=" typo</li> + <li>Used {@code memmove} instead of {@code memcpy} in {@code string::assign}</li> + <li>Added better handling of {@code IsNANorINF}, {@code IsINF}, {@code IsNegNAN}, + etc.</li> + </ul> + <p>For complete details, see the commit log.</p> + </li> + <li>{@code STLport}: Removed 5 unnecessary static initializers from the library.</li> + <li>The GNU libstdc++ libraries for armeabi-v7a were mistakenly compiled for + armeabi instead. This change had no impact on correctness, but using the right + ABI should provide slightly better performance.</li> + <li>The {@code cpu-features} helper library was updated to report three optional + x86 CPU features ({@code SSSE3}, {@code MOVBE} and {@code POPCNT}). See + {@code docs/CPU-FEATURES.html} for more details.</li> + <li>{@code docs/NDK-BUILD.html} was updated to mention {@code NDK_APPLICATION_MK} instead + of {@code NDK_APP_APPLICATION_MK} to select a custom {@code Application.mk} file.</li> + <li>Cygwin: {@code ndk-build} no longer creates an empty "NUL" file in the current + directory when invoked.</li> + <li>Cygwin: Added better automatic dependency detection. In the previous version, it + didn't work properly in the following cases: + <ul> + <li>When the Cygwin drive prefix was not {@code /cygdrive}.</li> + <li>When using drive-less mounts, for example, when Cygwin would translate + {@code /home} to {@code \\server\subdir} instead of {@code C:\Some\Dir}.</li> + </ul> + </li> + <li>Cygwin: {@code ndk-build} does not try to use the native Windows tools under + {@code $NDK/prebuilt/windows/bin} with certain versions of Cygwin and/or GNU Make.</li> + </ul> + </dd> + </dl> + </div> +</div> + + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" + alt="">Android NDK, Revision 7</a> <em>(November 2011)</em> + </p> + + <div class="toggle-content-toggleme"> + <p>This release of the NDK includes new features to support the Android 4.0 platform as well + as many other additions and improvements:</p> + + <dl> + <dt>New features</dt> + + <dd> + <ul> + <li>Added official NDK APIs for Android 4.0 (API level 14), which adds the following + native features to the platform: + + <ul> + <li>Added native multimedia API based on the Khronos Group OpenMAX AL? 1.0.1 + standard. The new <code><OMXAL/OpenMAXAL.h></code> and + <code><OMXAL/OpenMAXAL_Android.h></code> headers allow applications targeting + API level 14 to perform multimedia output directly from native code by using a new + Android-specific buffer queue interface. For more details, see + <code>docs/openmaxal/index.html</code> and <a href= + "http://www.khronos.org/openmax/">http://www.khronos.org/openmax/</a>.</li> + + <li>Updated the native audio API based on the Khronos Group OpenSL ES 1.0.1? + standard. With API Level 14, you can now decode compressed audio (e.g. MP3, AAC, + Vorbis) to PCM. For more details, see <code>docs/opensles/index.html</code> and + <a href= + "http://www.khronos.org/opensles">http://www.khronos.org/opensles/</a>.</li> + </ul> + </li> + + <li>Added CCache support. To speed up large rebuilds, define the + <code>NDK_CCACHE</code> environment variable to <code>ccache</code> (or the path to + your <code>ccache</code> binary). When declared, the NDK build system automatically + uses CCache when compiling any source file. For example: + <pre> +export NDK_CCACHE=ccache +</pre> + <p class="note"><strong>Note:</strong> CCache is not included in the NDK release + so you must have it installed prior to using it. For more information about CCache, see + <a href="http://ccache.samba.org">http://ccache.samba.org</a>.</p> + </li> + + <li>Added support for setting <code>APP_ABI</code> to <code>all</code> to indicate that + you want to build your NDK modules for all the ABIs supported by your given NDK + release. This means that either one of the following two lines in your + <code>Application.mk</code> are equivalent with this release: + <pre> +APP_ABI := all +APP_ABI := armeabi armeabi-v7a x86 +</pre> + + <p>This also works if you define <code>APP_ABI</code> when calling + <code>ndk-build</code> from the command-line, which is a quick way to check that your + project builds for all supported ABIs without changing the project's + <code>Application.mk file</code>. For example:</p> + <pre> +ndk-build APP_ABI=all +</pre> + </li> + + <li>Added a <code>LOCAL_CPP_FEATURES</code> variable in <code>Android.mk</code> that + allows you to declare which C++ features (RTTI or Exceptions) your module uses. This + ensures that the final linking works correctly if you have prebuilt modules that depend + on these features. See <code>docs/ANDROID-MK.html</code> and + <code>docs/CPLUSPLUS-SUPPORT.html</code> for more details.</li> + + <li>Shortened paths to source and object files that are used in build commands. When + invoking <code>$NDK/ndk-build</code> from your project path, the paths to the source, + object, and binary files that are passed to the build commands are significantly + shorter now, because they are passed relative to the current directory. This is useful + when building projects with a lot of source files, to avoid limits on the maximum + command line length supported by your host operating system. The behavior is unchanged + if you invoke <code>ndk-build</code> from a sub-directory of your project tree, or if + you define <code>NDK_PROJECT_PATH</code> to point to a specific directory.</li> + </ul> + </dd> + + <dt>Experimental features</dt> + + <dd> + You can now build your NDK source files on Windows <em>without</em> Cygwin by calling the + <code>ndk-build.cmd</code> script from the command line from your project path. The + script takes exactly the same arguments as the original <code>ndk-build</code> script. + The Windows NDK package comes with its own prebuilt binaries for GNU Make, Awk and other + tools required by the build. You should not need to install anything else to get a + working build system. + + <p class="caution"><strong>Important:</strong> <code>ndk-gdb</code> does not work on + Windows, so you still need Cygwin to debug.</p> + + <p>This feature is still experimental, so feel free to try it and report issues on the + <a href="http://b.android.com">public bug database</a> or <a href= + "http://groups.google.com/group/android-ndk">public forum</a>. All samples and unit tests + shipped with the NDK succesfully compile with this feature.</p> + </dd> + + <dt>Important bug fixes</dt> + + <dd> + <ul> + <li>Imported shared libraries are now installed by default to the target installation + location (<code>libs/<abi></code>) if <code>APP_MODULES</code> is not defined in + your <code>Application.mk</code>. For example, if a top-level module <code>foo</code> + imports a module <code>bar</code>, then both <code>libfoo.so</code> and + <code>libbar.so</code> are copied to the install location. Previously, only + <code>libfoo.so</code> was copied, unless you listed <code>bar</code> in your + <code>APP_MODULES</code> too. If you define <code>APP_MODULES</code> explicitly, the + behavior is unchanged.</li> + + <li><code>ndk-gdb</code> now works correctly for activities with multiple categories in + their MAIN intent filters.</li> + + <li>Static library imports are now properly transitive. For example, if a top-level + module <code>foo</code> imports static library <code>bar</code> that imports static + library <code>zoo</code>, the <code>libfoo.so</code> will now be linked against both + <code>libbar.a</code> and <code>libzoo.a</code>.</li> + </ul> + </dd> + + <dt>Other changes</dt> + + <dd> + <ul> + <li><code>docs/NATIVE-ACTIVITY.HTML</code>: Fixed typo. The minimum API level should be + 9, not 8 for native activities.</li> + + <li><code>docs/STABLE-APIS.html</code>: Added missing documentation listing EGL as a + supported stable API, starting from API level 9.</li> + + <li><code>download-toolchain-sources.sh</code>: Updated to download the toolchain + sources from <a href="http://android.googlesource.com">android.googlesource.com</a>, + which is the new location for the AOSP servers.</li> + + <li>Added a new C++ support runtime named <code>gabi++</code>. More details about it + are available in the updated <code>docs/CPLUSPLUS-SUPPORT.html</code>.</li> + + <li>Added a new C++ support runtime named <code>gnustl_shared</code> that corresponds + to the shared library version of GNU libstdc++ v3 (GPLv3 license). See more info at + <code>docs/CPLUSPLUS-SUPPORT.html</code></li> + + <li>Added support for RTTI in the STLport C++ runtimes (no support for + exceptions).</li> + + <li>Added support for multiple file extensions in <code>LOCAL_CPP_EXTENSION</code>. For + example, to compile both <code>foo.cpp</code> and <code>bar.cxx</code> as C++ sources, + declare the following: + <pre> +LOCAL_CPP_EXTENSION := .cpp .cxx +</pre> + </li> + + <li>Removed many unwanted exported symbols from the link-time shared system libraries + provided by the NDK. This ensures that code generated with the standalone toolchain + doesn't risk to accidentally depend on a non-stable ABI symbol (e.g. any libgcc.a + symbol that changes each time the toolchain used to build the platform is changed)</li> + + <li>Refreshed the EGL and OpenGLES Khronos headers to support more extensions. Note + that this does <em>not</em> change the NDK ABIs for the corresponding libraries, + because each extension must be probed at runtime by the client application. + + <p>The extensions that are available depend on your actual device and GPU drivers, + not the platform version the device runs on. The header changes simply add new + constants and types to make it easier to use the extensions when they have been + probed with <code>eglGetProcAddress()</code> or <code>glGetProcAddress()</code>. The + following list describes the newly supported extensions:</p> + + <dl> + <dt>GLES 1.x</dt> + + <dd> + <ul> + <li><code>GL_OES_vertex_array_object</code></li> + + <li><code>GL_OES_EGL_image_external</code></li> + + <li><code>GL_APPLE_texture_2D_limited_npot</code></li> + + <li><code>GL_EXT_blend_minmax</code></li> + + <li><code>GL_EXT_discard_framebuffer</code></li> + + <li><code>GL_EXT_multi_draw_arrays</code></li> + + <li><code>GL_EXT_read_format_bgra</code></li> + + <li><code>GL_EXT_texture_filter_anisotropic</code></li> + + <li><code>GL_EXT_texture_format_BGRA8888</code></li> + + <li><code>GL_EXT_texture_lod_bias</code></li> + + <li><code>GL_IMG_read_format</code></li> + + <li><code>GL_IMG_texture_compression_pvrtc</code></li> + + <li><code>GL_IMG_texture_env_enhanced_fixed_function</code></li> + + <li><code>GL_IMG_user_clip_plane</code></li> + + <li><code>GL_IMG_multisampled_render_to_texture</code></li> + + <li><code>GL_NV_fence</code></li> + + <li><code>GL_QCOM_driver_control</code></li> + + <li><code>GL_QCOM_extended_get</code></li> + + <li><code>GL_QCOM_extended_get2</code></li> + + <li><code>GL_QCOM_perfmon_global_mode</code></li> + + <li><code>GL_QCOM_writeonly_rendering</code></li> + + <li><code>GL_QCOM_tiled_rendering</code></li> + </ul> + </dd> + + <dt>GLES 2.0</dt> + + <dd> + <ul> + <li><code>GL_OES_element_index_uint</code></li> + + <li><code>GL_OES_get_program_binary</code></li> + + <li><code>GL_OES_mapbuffer</code></li> + + <li><code>GL_OES_packed_depth_stencil</code></li> + + <li><code>GL_OES_texture_3D</code></li> + + <li><code>GL_OES_texture_float</code></li> + + <li><code>GL_OES_texture_float_linear</code></li> + + <li><code>GL_OES_texture_half_float_linear</code></li> + + <li><code>GL_OES_texture_npot</code></li> + + <li><code>GL_OES_vertex_array_object</code></li> + + <li><code>GL_OES_EGL_image_external</code></li> + + <li><code>GL_AMD_program_binary_Z400</code></li> + + <li><code>GL_EXT_blend_minmax</code></li> + + <li><code>GL_EXT_discard_framebuffer</code></li> + + <li><code>GL_EXT_multi_draw_arrays</code></li> + + <li><code>GL_EXT_read_format_bgra</code></li> + + <li><code>GL_EXT_texture_format_BGRA8888</code></li> + + <li><code>GL_EXT_texture_compression_dxt1</code></li> + + <li><code>GL_IMG_program_binary</code></li> + + <li><code>GL_IMG_read_format</code></li> + + <li><code>GL_IMG_shader_binary</code></li> + + <li><code>GL_IMG_texture_compression_pvrtc</code></li> + + <li><code>GL_IMG_multisampled_render_to_texture</code></li> + + <li><code>GL_NV_coverage_sample</code></li> + + <li><code>GL_NV_depth_nonlinear</code></li> + + <li><code>GL_QCOM_extended_get</code></li> + + <li><code>GL_QCOM_extended_get2</code></li> + + <li><code>GL_QCOM_writeonly_rendering</code></li> + + <li><code>GL_QCOM_tiled_rendering</code></li> + </ul> + </dd> + + <dt>EGL</dt> + + <dd> + <ul> + <li><code>EGL_ANDROID_recordable</code></li> + + <li><code>EGL_NV_system_time</code></li> + </ul> + </dd> + </dl> + </li> + </ul> + </dd> + </dl> + </div> +</div> + + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" + alt="">Android NDK, Revision 6b</a> <em>(August 2011)</em> + </p> + + <div class="toggle-content-toggleme"> + <p>This release of the NDK does not include any new features compared to r6. The r6b release + addresses the following issues in the r6 release:</p> + <dl> + <dt>Important bug fixes</dt> + <dd> + <ul> + <li>Fixed the build when <code>APP_ABI="armeabi x86"</code> is used for + multi-architecture builds.</li> + <li>Fixed the location of prebuilt STLport binaries in the NDK release package. + A bug in the packaging script placed them in the wrong location.</li> + <li>Fixed <code>atexit()</code> usage in shared libraries with the x86standalone + toolchain.</li> + <li>Fixed <code>make-standalone-toolchain.sh --arch=x86</code>. It used to fail + to copy the proper GNU libstdc++ binaries to the right location.</li> + <li>Fixed the standalone toolchain linker warnings about missing the definition and + size for the <code>__dso_handle</code> symbol (ARM only).</li> + <li>Fixed the inclusion order of <code>$(SYSROOT)/usr/include</code> for x86 builds. + See the <a href="http://b.android.com/18540">bug</a> for + more information.</li> + <li>Fixed the definitions of <code>ptrdiff_t</code> and <code>size_t</code> in + x86-specific systems when they are used with the x86 standalone toolchain.</li> + </ul> + </dd> + </dl> + </div> +</div> + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" + alt="">Android NDK, Revision 6</a> <em>(July 2011)</em> + </p> + + <div class="toggle-content-toggleme"> + <p>This release of the NDK includes support for the x86 ABI and other minor changes. + For detailed information describing the changes in this release, read the + <code>CHANGES.HTML</code> document included in the NDK package. + </p> + <dl> + <dt>General notes:</dt> + <dd> + <ul> + <li>Adds support for the x86 ABI, which allows you to generate machine code + that runs on compatible x86-based Android devices. Major features for x86 + include x86-specific toolchains, system headers, libraries and + debugging support. For all of the details regarding x86 support, + see <code>docs/CPU-X86.html</code> in the NDK package. + + <p>By default, code is generated for ARM-based devices, but you can add x86 to your + <code>APP_ABI</code> definition in your <code>Application.mk</code> file to build + for x86 platforms. For example, the following line instructs <code>ndk-build</code> + to build your code for three distinct ABIs:</p> + + <pre>APP_ABI := armeabi armeabi-v7a x86</pre> + + <p>Unless you rely on ARM-based assembly sources, you shouldn't need to touch + your <code>Android.mk</code> files to build x86 machine code.</p> + + </li> + + <li>You can build a standalone x86 toolchain using the +<code>--toolchain=x86-4.4.3</code> + option when calling <code>make-standalone-toolchain.sh</code>. See + <code>docs/STANDALONE-TOOLCHAIN.html</code> for more details. + </li> + <li>The new <code>ndk-stack</code> tool lets you translate stack traces in + <code>logcat</code> that are generated by native code. The tool translates + instruction addresses into a readable format that contains things such + as the function, source file, and line number corresponding to each stack frame. + For more information and a usage example, see <code>docs/NDK-STACK.html</code>. + </li> + </ul> + </dd> + <dt>Other changes:</dt> + <dd><code>arm-eabi-4.4.0</code>, which had been deprecated since NDK r5, has been + removed from the NDK distribution.</dd> + + </dl> + </div> + </div> + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" + alt="">Android NDK, Revision 5c</a> <em>(June 2011)</em> + </p> + + <div class="toggle-content-toggleme"> + <p>This release of the NDK does not include any new features compared to r5b. The r5c release + addresses the following problems in the r5b release:</p> + <dl> + <dt>Important bug fixes:</dt> + <dd> + <ul> + <li><code>ndk-build</code>: Fixed a rare bug that appeared when trying to perform parallel + builds of debuggable projects.</li> + + <li>Fixed a typo that prevented <code>LOCAL_WHOLE_STATIC_LIBRARIES</code> to work + correctly with the new toolchain and added documentation for this in + <code>docs/ANDROID-MK.html</code>.</li> + + <li>Fixed a bug where code linked against <code>gnustl_static</code> crashed when run on + platform releases older than API level 8 (Android 2.2).</li> + + <li><code>ndk-gdb</code>: Fixed a bug that caused a segmentation fault when debugging +Android 3.0 + or newer devices.</li> + + <li><code><android/input.h></code>: Two functions that were introduced in API level + 9 (Android 2.3) were incorrect and are fixed. While this breaks the source API, the + binary interface to the system is unchanged. The incorrect functions were missing a + <code>history_index</code> parameter, and the correct definitions are shown below: +<pre> +float AMotionEvent_getHistoricalRawX(const AInputEvent* motion_event, + size_t pointer_index, + size_t history_index); + +float AMotionEvent_getHistoricalRawY(const AInputEvent* motion_event, + size_t pointer_index, + size_t history_index); +</pre> + </li> + + <li>Updated the C library ARM binary for API level 9 (Android 2.3) to correctly expose at + link time new functions that were added in that API level (for example, + <code>pthread_rwlock_init</code>).</li> + + </ul> + </dd> + + <dt>Minor improvements and fixes:</dt> + <dd> + <ul> + <li>Object files are now always linked in the order they appear in + <code>LOCAL_SRC_FILES</code>. This was not the case previously because the files were + grouped by source extensions instead.</li> + + <li>When <code>import-module</code> fails, it now prints the list of directories that + were searched. This is useful to check that the <code>NDK_MODULE_PATH</code> definition + used by the build system is correct.</li> + + <li>When <code>import-module</code> succeeds, it now prints the directory where the + module was found to the log (visible with <code>NDK_LOG=1</code>).</li> + + <li>Increased the build speed of debuggable applications when there is a very large number + of include directories in the project.</li> + + <li><code>ndk-gdb</code>: Better detection of <code>adb shell</code> failures and improved + error messages.</li> + + <li><code><pthread.h></code>: Fixed the definition of + <code>PTHREAD_RWLOCK_INITIALIZER</code> for API level 9 (Android 2.3) and higher.</li> + + <li>Fixed an issue where a module could import itself, resulting in an infinite loop in + GNU Make.</li> + + <li>Fixed a bug that caused the build to fail if <code>LOCAL_ARM_NEON</code> was set to + true (typo in <code>build/core/build-binary.mk</code>).</li> + + <li>Fixed a bug that prevented the compilation of <code>.s</code> assembly files + (<code>.S</code> files were okay).</li> + </ul> + </dd> + </dl> + </div> +</div> + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" + alt="">Android NDK, Revision 5b</a> <em>(January 2011)</em> + </p> + + <div class="toggle-content-toggleme"> + <p>This release of the NDK does not include any new features compared to r5. The r5b release +addresses the + following problems in the r5 release: + </p> + <ul> + <li>The r5 binaries required glibc 2.11, but the r5b binaries are generated with a special + toolchain that targets glibc 2.7 or higher instead. The Linux toolchain binaries now run on +Ubuntu 8.04 or higher. </li> + <li>Fixes a compiler bug in the arm-linux-androideabi-4.4.3 toolchain. + The previous binary generated invalid thumb instruction sequences when + dealing with signed chars.</li> + <li>Adds missing documentation for the + "gnustl_static" value for APP_STL, that allows you to link against + a static library version of GNU libstdc++. </li> the + <li>Fixed the following <code>ndk-build</code> issues: + <ul> + <li>A bug that created inconsistent dependency files when a + compilation error occured on Windows. This prevented a proper build after + the error was fixed in the source code.</li> + <li>A Cygwin-specific bug where using very short paths for + the Android NDK installation or the project path led to the + generation of invalid dependency files. This made incremental builds + impossible.</li> + <li>A typo that prevented the cpufeatures library from working correctly + with the new NDK toolchain.</li> + <li>Builds in Cygwin are faster by avoiding calls to <code>cygpath -m</code> + from GNU Make for every source or object file, which caused problems + with very large source trees. In case this doesn't work properly, define +<code>NDK_USE_CYGPATH=1</code> in your + environment to use <code>cygpath -m</code> again.</li> + <li>The Cygwin installation now notifies the user of invalid installation paths that +contain spaces. Previously, an invalid path + would output an error that complained about an incorrect version of GNU Make, even if the +right one was installed. + </ul> + </li> + <li>Fixed a typo that prevented the <code>NDK_MODULE_PATH</code> environment variable from +working properly when + it contained multiple directories separated with a colon. </li> + <li>The <code>prebuilt-common.sh</code> script contains fixes to check the compiler for 64-bit + generated machine code, instead of relying on the host tag, which + allows the 32-bit toolchain to rebuild properly on Snow Leopard. The toolchain rebuild scripts +now also support + using a 32-bit host toolchain.</li> + <li>A missing declaration for <code>INET_ADDRSTRLEN</code> was added to +<code><netinet/in.h></code>.</li> + <li>Missing declarations for <code>IN6_IS_ADDR_MC_NODELOCAL</code> and +<code>IN6_IS_ADDR_MC_GLOBAL</code> were added to <code><netinet/in6.h></code>.</li> + <li>'asm' was replaced with '__asm__' in <code><asm/byteorder.h></code> to allow +compilation with <code>-std=c99</code>.</li> + </ul> + </div> + </div> + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" + alt="">Android NDK, Revision 5</a> <em>(December 2010)</em> + </p> + + <div class="toggle-content-toggleme"> + <p>This release of the NDK includes many new APIs, most of which are introduced to + support the development of games and similar applications that make extensive use + of native code. Using the APIs, developers have direct native access to events, audio, + graphics and window management, assets, and storage. Developers can also implement the + Android application lifecycle in native code with help from the new + {@link android.app.NativeActivity} class. For detailed information describing the changes +in this + release, read the <code>CHANGES.HTML</code> document included in the downloaded NDK +package. + </p> + <dl> + <dt>General notes:</dt> + <dd> + <ul> + <li>Adds support for native activities, which allows you to implement the + Android application lifecycle in native code.</li> + + <li>Adds native support for the following: + + <ul> + + <li>Input subsystem (such as the keyboard and touch screen)</li> + + <li>Access to sensor data (accelerometer, compass, gyroscope, etc).</li> + + <li>Event loop APIs to wait for things such as input and sensor events.</li> + + <li>Window and surface subsystem</li> + + <li>Audio APIs based on the OpenSL ES standard that support playback and recording + as well as control over platform audio effects</li> + + <li>Access to assets packaged in an <code>.apk</code> file.</li> + + </ul> + </li> + + <li>Includes a new toolchain (based on GCC 4.4.3), which generates better code, and can +also now + be used as a standalone cross-compiler, for people who want to build their stuff with + <code>./configure && make</code>. See + docs/STANDALONE-TOOLCHAIN.html for the details. The binaries for GCC 4.4.0 are still +provided, + but the 4.2.1 binaries were removed.</li> + + <li>Adds support for prebuilt static and shared libraries (docs/PREBUILTS.html) and +module + exports and imports to make sharing and reuse of third-party modules much easier + (docs/IMPORT-MODULE.html explains why).</li> + + <li>Provides a default C++ STL implementation (based on STLport) as a helper module. It +can be used either + as a static or shared library (details and usage examples are in +sources/android/stlport/README). Prebuilt + binaries for STLport (static or shared) and GNU libstdc++ (static only) are also +provided if you choose to + compile against those libraries instead of the default C++ STL implementation. + C++ Exceptions and RTTI are not supported in the default STL implementation. For more +information, see + docs/CPLUSPLUS-SUPPORT.HTML.</li> + + <li>Includes improvements to the <code>cpufeatures</code> helper library that improves +reporting + of the CPU type (some devices previously reported ARMv7 CPU when the device really was +an ARMv6). We + recommend developers that use this library to rebuild their applications then + upload to Google Play to benefit from the improvements.</li> + + <li>Adds an EGL library that lets you create and manage OpenGL ES textures and + services.</li> + + <li>Adds new sample applications, <code>native-plasma</code> and +<code>native-activity</code>, + to demonstrate how to write a native activity.</li> + + <li>Includes many bugfixes and other small improvements; see docs/CHANGES.html for a +more + detailed list of changes.</li> + </ul> + </dd> + </dl> + </div> + </div> + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" + alt="">Android NDK, Revision 4b</a> <em>(June 2010)</em> + </p> + + <div class="toggle-content-toggleme"> + <dl> + <dt>NDK r4b notes:</dt> + + <dd> + <p>Includes fixes for several issues in the NDK build and debugging scripts — if + you are using NDK r4, we recommend downloading the NDK r4b build. For detailed + information describing the changes in this release, read the CHANGES.TXT document + included in the downloaded NDK package.</p> + </dd> + </dl> + + <dl> + <dt>General notes:</dt> + + <dd> + <ul> + <li>Provides a simplified build system through the new <code>ndk-build</code> build + command.</li> + + <li>Adds support for easy native debugging of generated machine code on production + devices through the new <code>ndk-gdb</code> command.</li> + + <li>Adds a new Android-specific ABI for ARM-based CPU architectures, + <code>armeabi-v7a</code>. The new ABI extends the existing <code>armeabi</code> ABI to + include these CPU instruction set extensions: + + <ul> + <li>Thumb-2 instructions</li> + + <li>VFP hardware FPU instructions (VFPv3-D16)</li> + + <li>Optional support for ARM Advanced SIMD (NEON) GCC intrinsics and VFPv3-D32. + Supported by devices such as Verizon Droid by Motorola, Google Nexus One, and + others.</li> + </ul> + </li> + + <li>Adds a new <code>cpufeatures</code> static library (with sources) that lets your + app detect the host device's CPU features at runtime. Specifically, applications can + check for ARMv7-A support, as well as VFPv3-D32 and NEON support, then provide separate + code paths as needed.</li> + + <li>Adds a sample application, <code>hello-neon</code>, that illustrates how to use the + <code>cpufeatures</code> library to check CPU features and then provide an optimized + code path using NEON instrinsics, if supported by the CPU.</li> + + <li>Lets you generate machine code for either or both of the instruction sets supported + by the NDK. For example, you can build for both ARMv5 and ARMv7-A architectures at the + same time and have everything stored to your application's final + <code>.apk</code>.</li> + + <li>To ensure that your applications are available to users only if their devices are + capable of running them, Google Play now filters applications based on the + instruction set information included in your application — no action is needed on + your part to enable the filtering. Additionally, the Android system itself also checks + your application at install time and allows the installation to continue only if the + application provides a library that is compiled for the device's CPU architecture.</li> + + <li>Adds support for Android 2.2, including a new stable API for accessing the pixel + buffers of {@link android.graphics.Bitmap} objects from native code.</li> + </ul> + </dd> + </dl> + </div> + </div> + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" + alt="">Android NDK, Revision 3</a> <em>(March 2010)</em> + </p> + + <div class="toggle-content-toggleme"> + <dl> + <dt>General notes:</dt> + + <dd> + <ul> + <li>Adds OpenGL ES 2.0 native library support.</li> + + <li>Adds a sample application,<code>hello-gl2</code>, that illustrates the use of + OpenGL ES 2.0 vertex and fragment shaders.</li> + + <li>The toolchain binaries have been refreshed for this release with GCC 4.4.0, which + should generate slightly more compact and efficient machine code than the previous one + (4.2.1). The NDK also still provides the 4.2.1 binaries, which you can optionally use + to build your machine code.</li> + </ul> + </dd> + </dl> + </div> + </div> + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" + alt="">Android NDK, Revision 2</a> <em>(September 2009)</em> + </p> + + <div class="toggle-content-toggleme"> + <p>Originally released as "Android 1.6 NDK, Release 1".</p> + + <dl> + <dt>General notes:</dt> + + <dd> + <ul> + <li>Adds OpenGL ES 1.1 native library support.</li> + + <li>Adds a sample application, <code>san-angeles</code>, that renders 3D graphics + through the native OpenGL ES APIs, while managing activity lifecycle with a {@link + android.opengl.GLSurfaceView} object.</li> + </ul> + </dd> + </dl> + </div> + </div> + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" + alt="">Android NDK, Revision 1</a> <em>(June 2009)</em> + </p> + + <div class="toggle-content-toggleme"> + <p>Originally released as "Android 1.5 NDK, Release 1".</p> + + <dl> + <dt>General notes:</dt> + + <dd> + <ul> + <li>Includes compiler support (GCC) for ARMv5TE instructions, including Thumb-1 + instructions.</li> + + <li>Includes system headers for stable native APIs, documentation, and sample + applications.</li> + </ul> + </dd> + </dl> + </div> + </div> + + + + + +<!-- ####################### END OF RELEASE NOTES ####################### --> diff --git a/docs/html-ndk/ndk/guides/abis.jd b/docs/html-ndk/ndk/guides/abis.jd index 81604b5..ee55898 100644 --- a/docs/html-ndk/ndk/guides/abis.jd +++ b/docs/html-ndk/ndk/guides/abis.jd @@ -14,7 +14,7 @@ page.title=ABI Management </div> <p>Different Android handsets use different CPUs, which in turn support different instruction sets. -Each combination of CPU and instruction set(s) has its own Application Binary Interface, or +Each combination of CPU and instruction sets has its own Application Binary Interface, or <i>ABI</i>. The ABI defines, with great precision, how an application's machine code is supposed to interact with the system at runtime. You must specify an ABI for each CPU architecture you want your app to work with.</p> @@ -59,7 +59,7 @@ the instruction sets each ABI supports.</p> </tr> <tr> -<td><a href="#v7a">{@code armeabi-v7a}</a></td> +<td><a href="#v7a">{@code armeabi-v7a} ({@code armeabi-v7a-hard)}</a></td> <td> <li>armeabi</li> <li>Thumb-2</li> @@ -158,7 +158,8 @@ functions from the compiler's {@code libgcc.a} static library.</p> <a href="http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0210c/CACBCAAE.html"> Thumb (a.k.a. Thumb-1) instruction set</a>. The NDK generates Thumb code by default unless you specify different behavior using the -<code>LOCAL_ARM_MODE</code> variable in your <a href="android_mk.html"><code>Android.mk</code></a> +<code>LOCAL_ARM_MODE</code> variable in your +<a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a> file.</p> <h3 id="v7a">armeabi-v7a (armeabi-v7a-hard)</h3> @@ -186,7 +187,7 @@ check is similar to the one that the system typically performs to check or use instruction sets on x86 CPUs.</p> <p>For information about how to perform these runtime checks, refer to -<a href="{@docRoot}ndk/guides/cpu-features.html">CPU Features</a>. +<a href="{@docRoot}ndk/guides/cpu-features.html">The {@code cpufeatures} Library</a>. Also, for information about the NDK's support for building machine code for NEON, see <a href="{@docRoot}ndk/guides/cpu-arm-neon.html">NEON Support</a>.</p> @@ -250,7 +251,7 @@ The generated code is an optimization balanced across the top Intel 32-bit CPUs.</p> <p> For more information on compiler flags, particularly related to performance optimization, refer to <a href="http://software.intel.com/blogs/2012/09/26/gcc-x86-performance-hints">GCC -x86 Performance</a>.</p> +x86 performance hints</a>.</p> </li> <li>Use of the standard Linux x86 32-bit calling convention, as opposed to the one for SVR. For more information, see section 6, "Register Usage", of @@ -377,7 +378,7 @@ further information <h2 id="gc">Generating Code for a Specific ABI</h2> <p>By default, the NDK generates machine code for the armeabi ABI. You can generate ARMv7-a-compatible machine code, instead, by adding the following line -to your <a href="{docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file.</p> +to your <a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file.</p> <pre class="no-pretty-print"> APP_ABI := armeabi-v7a </pre> @@ -391,7 +392,7 @@ APP_ABI := armeabi armeabi-v7a <p>This setting tells the NDK to build two versions of your machine code: one for each ABI listed on this line. For more information on the values you can specify for the -{@code APP_ABI} variable, see <a href="{docRoot}ndk/guides/android_mk.html">Android.mk</a>. +{@code APP_ABI} variable, see <a href="{@docRoot}ndk/guides/android_mk.html">Android.mk</a>. </p> <p>When you build multiple machine-code versions, the build system copies the libraries to your @@ -490,4 +491,4 @@ copies them to <code>/lib/lib<name>.so</code>, under the application's {@code data} directory ({@code data/data/<package_name>/lib/}).</p> <p>If there is no shared-object file at all, the application builds and installs, but crashes at -runtime.</p>
\ No newline at end of file +runtime.</p> diff --git a/docs/html-ndk/ndk/guides/android_mk.jd b/docs/html-ndk/ndk/guides/android_mk.jd index da94679..8d0a8b1 100644 --- a/docs/html-ndk/ndk/guides/android_mk.jd +++ b/docs/html-ndk/ndk/guides/android_mk.jd @@ -9,9 +9,7 @@ page.title=Android.mk <li><a href="#over">Overview</a></li> <li><a href="#basics">Basics</a></li> <li><a href="#var">Variables and Macros</a></li> - <li><a href="#npv">NDK-provided variables</a></li> - <li><a href="#npfm">NDK-provided function macros</a></li> - <li><a href="#mdv">Module-description variables</a></li> + <li><a href="#mdv">Module-Description Variables</a></li> </ol> </div> </div> @@ -24,7 +22,8 @@ which glues your C and C++ source files to the Android NDK.</p> <p>The {@code Android.mk} file resides in a subdirectory of your project's {@code jni/} directory, and describes your sources and shared libraries to the build system. It is really a tiny GNU makefile fragment that the build system parses once or more. The {@code Android.mk} file is useful -for defining project-wide settings that {@code Application.mk}, the build system, and your +for defining project-wide settings that <a href="{@docRoot}ndk/guides/application_mk.html">{@code +Application.mk}</a>, the build system, and your environment variables leave undefined. It can also override project-wide settings for specific <i>modules</i>.</p> @@ -84,7 +83,7 @@ LOCAL_MODULE := hello-jni <p>Each module name must be unique and not contain any spaces. The build system, when it generates the final shared-library file, automatically adds the proper prefix and suffix to -the name that you assign to {@code LOCAL_MODULE|. For example, the example that appears above +the name that you assign to {@code LOCAL_MODULE}. For example, the example that appears above results in generation of a library called {@code libhello-jni.so}.</p> <p class="note"><strong>Note:</strong> If your module's name already starts with {@code lib}, the @@ -114,10 +113,10 @@ information you defined in {@code LOCAL_XXX} variables since the most recent {@c script determines what to build, and how to do it.</p> <p>There are more complex examples in the samples directories, with commented -{@code Android.mk} files that you can look at. In addition, the -<a href="{@docRoot}ndk/guides/native-activity.html">walkthrough</a> of the native-activity sample -disucsses that sample's {@code Android.mk} file in some detail. Finally, the next section explains -the variables from this section in a bit more detail. +{@code Android.mk} files that you can look at. In addition, +<a href="{@docRoot}ndk/guides/sample_na.html">Sample: native-activity</a> provides +a detailed explanation of that sample's {@code Android.mk} file. Finally, <a href="#var"> +Variables and Macros</a> provides further information on the variables from this section. <h2 id="var">Variables and Macros</h2> @@ -155,7 +154,7 @@ include $(CLEAR_VARS) you provided in your {@code LOCAL_XXX} variables, and determines how to build a target shared library from the sources you listed. Note that using this script requires that you have already assigned values to {@code LOCAL_MODULE} and {@code LOCAL_SRC_FILES}, at a minimum (for more -information about these variables, see <a href = "#mdv">Module-description variables</a>).</p> +information about these variables, see <a href = "#mdv">Module-Description Variables</a>).</p> <p>The syntax for using this variable is:</p> @@ -190,23 +189,14 @@ include $(PREBUILT_SHARED_LIBRARY) </pre> <p>You can also reference a prebuilt library in another module by using the -{@code LOCAL_PREBUILTS} variable. The following example shows an example of using -{@code LOCAL_PREBUILTS}: - -<!-- -<pre class="no-pretty-print"> -(TODO: Example of referencing prebuilt library from another, using LOCAL_PREBUILTS.) -</pre> ---> - -<p>For more information about using prebuilts, see <a href="{@docRoot}ndk/guides/prebuilts.html"> -NDK Prebuilt Library Support</a>.</p> +{@code LOCAL_PREBUILTS} variable. For more information about using prebuilts, see +<a href="{@docRoot}ndk/guides/prebuilts.html">Using Prebuilt Libraries</a>.</p> <h4>PREBUILT_STATIC_LIBRARY</h4> <p>The same as {@code PREBUILT_SHARED_LIBRARY}, but for a prebuilt static library. For more -information about using prebuilts, see <a href="{@docRoot}ndk/guides/prebuilts.html">NDK Prebuilt -Library Support</a>.</p> +information about using prebuilts, see <a href="{@docRoot}ndk/guides/prebuilts.html">Using Prebuilt +Libraries</a>.</p> <h4>TARGET_ARCH</h4> <p>The name of the target CPU architecture as the Android Open Source Project specifies it. @@ -214,14 +204,13 @@ For any ARM-compatible build, use {@code arm}, independent of the CPU architectu ABI (see TARGET_ARCH_ABI, below).</p> <p>The value of this variable is taken from the APP_ABI variable that you define in the -<a href="{docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a> file, which the system -reads ahead of parsing the {@code Android.mk} file.</p> +{@code Android.mk} file, which the system reads ahead of parsing the {@code Android.mk} file.</p> <h4>TARGET_PLATFORM</h4> <p>The Android API level number for the build system to target. For example, the Android 5.1 system images correspond to Android API level 22: {@code android-22}. For a complete list of platform names and corresponding Android system -images, see <a href="{@docRoot}ndk/guides/stable_apis.html">Android NDK Stable APIs</a>. +images, see <a href="{@docRoot}ndk/guides/stable_apis.html">Android NDK Native APIs</a>. The following example shows the syntax for using this variable:</p> <pre class="no-pretty-print"> @@ -242,36 +231,36 @@ supported CPU and architecture. <th scope="col">Setting</th> </tr> <tr> - <th scope="col">ARMv5TE</th> - <th scope="col">{@code armeabi}</th> + <td>ARMv5TE</td> + <td>{@code armeabi}</td> </tr> <tr> - <th scope="col">ARMv7</th> - <th scope="col">{@code armeabi-v7a}</th> + <td>ARMv7</td> + <td>{@code armeabi-v7a}</td> </tr> <tr> - <th scope="col">ARMv8 AArch64</th> - <th scope="col">{@code arm64-v8a}</th> + <td>ARMv8 AArch64</td> + <td>{@code arm64-v8a}</td> </tr> <tr> - <th scope="col">i686</th> - <th scope="col">{@code x86}</th> + <td>i686</td> + <td>{@code x86}</td> </tr> <tr> - <th scope="col">x86-64</th> - <th scope="col">{@code x86_64}</th> + <td>x86-64</td> + <td>{@code x86_64}</td> </tr> <tr> - <th scope="col">mips32 (r1)</th> - <th scope="col">{@code mips}</th> + <td>mips32 (r1)</td> + <td>{@code mips}</td> </tr> <tr> - <th scope="col">mips64 (r6)</th> - <th scope="col">{@code mips64}</th> + <td>mips64 (r6)</td> + <td>{@code mips64}</td> </tr> <tr> - <th scope="col">All</th> - <th scope="col">{@code all}</th> + <td>All</td> + <td>{@code all}</td> </tr> </table> @@ -286,8 +275,7 @@ TARGET_ARCH_ABI := arm64-v8a <p>For more details about architecture ABIs and associated compatibility issues, refer to -<a href="{@docRoot}ndk/guides/md_3__key__topics__c_p_u__support__chapter_1-section_8__a_b_is.html"> -Android Native CPU ABI Management</a></p> +<a href="{@docRoot}ndk/guides/abis.html">ABI Management</a>.</p> <p>New target ABIs in the future will have different values.</p> @@ -303,7 +291,7 @@ TARGET_ABI := android-22-arm64-v8a <p class="note"><strong>Note:</strong> Up to Android NDK 1.6_r1, the default value was {@code android-3-arm}.</p> -<h2 id="mdv">Module-description variables</h2> +<h2 id="mdv">Module-Description Variables</h2> <p>The variables in this section describe your module to the build system. Each module description should follow this basic flow: <ul> @@ -332,7 +320,8 @@ to define it a single time, even if your {@code Android.mk} file describes multi and must not contain any spaces. You must define it before including any scripts (other than the one for {@code CLEAR_VARS}). You need not add either the {@code lib} prefix or the {@code .so} or {@code .a} file extension; the build system makes these modifications -automatically. Throughout your {@code Android.mk} and {@code Application.mk} files, refer to +automatically. Throughout your {@code Android.mk} and +<a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> files, refer to your module by its unmodified name. For example, the following line results in the generation of a shared library module called {@code libfoo.so}:</p> @@ -365,8 +354,7 @@ module. Only list the files that the build system actually passes to the compile system automatically computes any associated depencies.</p> <p>Note that you can use both relative (to {@code LOCAL_PATH}) and absolute file paths. -<p>We recommend avoiding absolute file paths; relative paths make your -<a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a> file more +<p>We recommend avoiding absolute file paths; relative paths make your {@code Android.mk} file more portable.</p> <p class="note"><strong>Note: </strong> Always use Unix-style forward slashes (/) in build files. @@ -450,8 +438,8 @@ definitions or compile options.</p> <p>Try not to change the optimization/debugging level in your {@code Android.mk} file. The build system can handle this setting automatically for you, using the relevant information -in the {@code Application.mk} file. Doing it this way allows the build system to generate useful -data files used during debugging.</p> +in the <a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file. Doing it +this way allows the build system to generate useful data files used during debugging.</p> <p class="note"><strong>Note: </strong>In android-ndk-1.5_r1, the corresponding flags only applied to C source files, not C++ ones. They now match the full Android build system behavior. @@ -520,7 +508,7 @@ LOCAL_LDLIBS := -lz </pre> <p>For the list of exposed system libraries against which you can link in this NDK release, see -<a href="stable_apis.html">Android NDK Stable APIs</a>.</p> +<a href="stable_apis.html">Android NDK Native APIs</a>.</p> <p class="note"><strong>Note: </strong> If you define this variable for a static library, the build system ignores it, and {@code ndk-build} prints a warning.</p> @@ -574,22 +562,20 @@ LOCAL_SRC_FILES := foo.c bar.c.arm <p class="note"><strong>Note: </strong> You can also force the build system to generate ARM binaries by setting {@code APP_OPTIM} in your -<a href="{@docRoot}ndk/guides/application_mk.html>{@code Application.mk}</a> file to {@code debug}. -Specifying {@code debug} forces an ARM build because the toolchain debugger does not handle thumb +<a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file to {@code debug}. +Specifying {@code debug} forces an ARM build because the toolchain debugger does not handle Thumb code properly.</p> <h4>LOCAL_ARM_NEON</h4> -<p>This variable only matters when you are targetting the {@code armeabi-v7a} ABI. It allows the +<p>This variable only matters when you are targeting the {@code armeabi-v7a} ABI. It allows the use of ARM Advanced SIMD (NEON) GCC intrinsics in your C and C++ sources, as well as NEON instructions in Assembly files.</p> <p>Note that not all ARMv7-based CPUs support the NEON instruction set extensions. For this reason, you must perform runtime detection to be able to safely use this code at runtime. For more -information, please see <a href="{@docRoot}ndk/guides/cpu_support.html">Android -NDK & ARM NEON Instruction Set Extension Support</a> and <a -href="{@docRoot}ndk/guides/cpu_features.html">Android -NDK CPU Features Detection Library</a>.</p> +information, see <a href="{@docRoot}ndk/guides/cpu-arm-neon.html">NEON Support</a> and <a +href="{@docRoot}ndk/guides/cpu-features.html">The {@code cpufeatures} Library</a>.</p> <p>Alternatively, you can use the {@code .neon} suffix to specify that the build system only compile specific source files with NEON support. In the following example, the build system compiles @@ -635,8 +621,8 @@ enhancements in RedHat Enterprise Linux (section 6)</a>.</p> <p>By default, the build system compiles code with format string protection. Doing so forces a compiler error if a non-constant format string is used in a {@code printf}-style function.</p> -<p>This protection is off by default, but you can disable it by setting its value to -{@code true}. We do not recommend doing so without a compelling reason.</p> +<p>This protection is on by default, but you can disable it by setting the value of +this variable to {@code true}. We do not recommend doing so without a compelling reason.</p> <h4>LOCAL_EXPORT_CFLAGS</h4> @@ -729,7 +715,7 @@ individual source files, placing nearly all compiler flags inside list files, to <p>Note that any value other than {@code true} will revert to the default behaviour. You can also define {@code APP_SHORT_COMMANDS} in your -<a href="{docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file to force this +<a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file to force this behavior for all modules in your project.</p> <p>We do not recommend enabling this feature by default, since it makes the build slower.</p> @@ -745,7 +731,8 @@ contain.</p> such libraries <em>cannot</em> be moved to a different location (all paths inside them are relative).</p> <p>Valid values are {@code true}, {@code false} or empty. A -default value can be set in your {@code Application.mk} file through the {@code APP_THIN_ARCHIVE} +default value can be set in your <a href="{@docRoot}ndk/guides/application_mk.html"> +{@code Application.mk}</a> file through the {@code APP_THIN_ARCHIVE} variable.</p> <p class="note"><strong>Note:</strong> This is ignored for non-static library modules, or prebuilt @@ -785,7 +772,7 @@ myasmfilter $OBJS_DIR/foo.S.original $OBJS_DIR/foo.S myasmfilter bar.S $OBJS_DIR/bar.S </pre> -<h3 id="npfm">NDK-Provided Function Macros</h2> +<h3 id="npfm">NDK-provided function macros</h2> <p>This section explains GNU Make function macros that the NDK provides. Use {@code $(call <function>)} to evaluate them; they return textual information.</p> @@ -876,16 +863,16 @@ included the current one).</p> included the current one).</p> <h4>import-module</h4> -<p>A function that allows you to find and include the {@code Android.mk} -of another module by name. A typical example is as follows: </p> +<p>A function that allows you to find and include a module's {@code Android.mk} file by the name of +the module. A typical example is as follows: </p> <pre class="no-pretty-print"> $(call import-module,<name>) </pre> -<p>In this example, the build system looks for the module tagged <name> in the list of +<p>In this example, the build system looks for the module tagged {@code <name>} in the list of directories referenced that your {@code NDK_MODULE_PATH} environment variable references, and includes its {@code Android.mk} file automatically for you.</p> -<p>For more information, see <a href="import_module.html">Android Module Paths (Sharing Code)</a>. +<p>For more information, see <a href="import.html">Android Module Paths (Sharing Code)</a>. </p> diff --git a/docs/html-ndk/ndk/guides/application_mk.jd b/docs/html-ndk/ndk/guides/application_mk.jd index be82fbe..fab611b 100644 --- a/docs/html-ndk/ndk/guides/application_mk.jd +++ b/docs/html-ndk/ndk/guides/application_mk.jd @@ -117,7 +117,7 @@ NDK's top-level directory.</p> <h4>APP_ABI</h4> <p>By default, the NDK build system generates machine code for the -<a href="{docRoot}ndk/guides/abis.html">{@code armeabi}</a> ABI. This machine code +<a href="{@docRoot}ndk/guides/abis.html">{@code armeabi}</a> ABI. This machine code corresponds to an ARMv5TE-based CPU with software floating point operations. You can use {@code APP_ABI} to select a different ABI. Table 1 shows the {@code APP_ABI} settings for different instruction sets.</p> @@ -169,50 +169,26 @@ APP_ABI := armeabi armeabi-v7a x86 mips </pre> <p>For the list of all supported ABIs and details about their usage and limitations, refer to -<a href="{@docRoot}ndk/guides/abis.html">Android Native CPU ABI Management</a>.</p> +<a href="{@docRoot}ndk/guides/abis.html">ABI Management</a>.</p> <h4>APP_PLATFORM</h4> <p>This variable contains the name of the target Android platform. For example, {@code android-3} specifies the Android 1.5 system images. For a complete list of platform names and corresponding -Android system images, see <a href="{@docRoot}ndk/guides/stable_apis.html">Android NDK Stable APIs +Android system images, see <a href="{@docRoot}ndk/guides/stable_apis.html">Android NDK Native APIs </a>.</p> <h4>APP_STL</h4> <p>By default, the NDK build system provides C++ headers for the minimal C++ runtime library ({@code system/lib/libstdc++.so}) provided by the Android system. In addition, it comes with alternative C++ implementations that you can use or link to in your own applications. -Use {@code APP_STL} to select one of them. Table 2 shows the {@code APP_STL} values to specify -support for different libraries.</p> - -<p class="table-caption" id="table2"> - <strong>Table 2.</strong> {@code APP_STL} settings to support different libraries.</p> -<table> - <tr> - <th scope="col">Library</th> - <th scope="col">Value</th> - </tr> - <tr> - <td>Static STLport</td> - <td>{@code APP_STL := stlport_static}</td> - </tr> - <tr> - <td>Shared STLport</td> - <td>{@code APP_STL := stlport_shared}</td> - </tr> - <tr> - <td>Default C++ runtime</td> - <td>{@code APP_STL := system}</td> - </tr> -</table> - -<p>For more information on this subject, see <a href="{@docRoot}ndk/guides/cpp_support.html">C++ -Support</a>.</p> - +Use {@code APP_STL} to select one of them. For information about the supported runtimes, and the +features they offer, see <a href="{@docRoot}ndk/guides/cpp-support.html#runtimes">NDK Runtimes and +Features</a>. <h4>APP_SHORT_COMMANDS</h4> <p>The equivalent of {@code LOCAL_SHORT_COMMANDS} in {@code Application.mk} for your whole project. For more information, see the documentation for this variable on -<a href="{docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a>.</p> +<a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a>.</p> <h4>NDK_TOOLCHAIN_VERSION</h4> <p>Define this variable as either {@code 4.9} or {@code 4.8} to select a version of the GCC @@ -222,10 +198,12 @@ To select a version of Clang, define this variable as {@code clang3.4}, {@code c <h4>APP_PIE</h4> <p>Starting from Android 4.1 (API level 16), Android's dynamic linker supports position-independent -executables (PIE). Use the {@code -fPIE} flag to build them. This flag makes it harder to exploit -memory corruption bugs by randomizing code location. By default, {@code ndk-build} automatically -sets this value to {@code true} if your project targets {@code android-16} or higher. You may set -it manually to either {@code true} or {@code false}.</p> +executables (PIE). From Android 5.0 (API level 21), executables require PIE. + +To use PIE to build your executables, set the {@code -fPIE} flag. This flag makes it harder to +exploit memory corruption bugs by randomizing code location. By default, {@code ndk-build} +automatically sets this value to {@code true} if your project targets {@code android-16} or higher. +You may set it manually to either {@code true} or {@code false}.</p> <p>This flag applies only to executables. It has no effect when building shared or static libraries.</p> @@ -237,5 +215,5 @@ libraries.</p> <h4>APP_THIN_ARCHIVE</h4> <p>Sets the default value of {@code LOCAL_THIN_ARCHIVE} in the {@code Android.mk} file for all static library modules in this project. For more information, see the documentation for -{@code LOCAL_THIN_ARCHIVE} on <a href="{docRoot}ndk/guides/android_mk.html">{@code Android.mk}.</a> +{@code LOCAL_THIN_ARCHIVE} on <a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}.</a> </p> diff --git a/docs/html-ndk/ndk/guides/arch.jd b/docs/html-ndk/ndk/guides/arch.jd index 875bbd9..3dafe8f 100644 --- a/docs/html-ndk/ndk/guides/arch.jd +++ b/docs/html-ndk/ndk/guides/arch.jd @@ -1,31 +1,19 @@ -page.title=Architectures and CPUs +page.title=CPUs and Architectures @jd:body -<div class="contents"> -<div class="textblock"><p>This section includes detailed information about ABIs and detailed information on support for respective instruction sets. It includes these topics:</p> -<ul> -<li><a href="./md_3__key__topics__c_p_u__support__chapter_1-section_8__a_b_is.html">ABI Management</a><ul> -<li>Different ABIs support different CPUs and processing capabilities.</li> -</ul> -</li> -<li><a href="./md_3__key__topics__c_p_u__support__c_p_u-_a_r_m-_n_e_o_n.html">Neon</a><ul> -<li>Details about targeting devices whose CPUs support Neon, or Advanced SIMD. Neon is an optional extension of the armv7 architecture.</li> -</ul> -</li> -<li><a href="./md_3__key__topics__c_p_u__support__c_p_u-_m_i_p_s.html">Mips</a><ul> -<li>Details about targeting devices with CPUs supporting the MIPS32 instruction set.</li> -</ul> -</li> -<li><a href="./md_3__key__topics__c_p_u__support__c_p_u-_x86.html">x86</a><ul> -<li>Details about targeting devices with CPUs supporting the IA-32 instruction set.</li> -</ul> -</li> -<li><a href="./md_3__key__topics__c_p_u__support__c_p_u-_x86-64.html">x86-64</a><ul> -<li>Details about targeting devices whose CPUs support the x86-64 instruction set.</li> -</ul> -</li> -<li><a href="./md_3__key__topics__c_p_u__support__c_p_u-_f_e_a_t_u_r_e_s.html">CPU Features</a><ul> -<li>A small library that detects the target device's CPU family and supported features. </li> -</ul> -</li> -</ul>
\ No newline at end of file +<p>When you're working with native code, hardware matters. The NDK lets you ensure you're compiling +for the right architectures and CPUs by giving you a variety of ABIs from which +to choose.</p> + +<p>This section begins by explaining how to target specific +<a href="{@docRoot}ndk/guides/abis.html">architectures and CPUs</a>. It then +provides information you need to know when targeting the +<a href="{@docRoot}ndk/guides/abis.html">ARM</a> +family of CPUs and architectures. Next, it provides information about the other CPUs and +architectures that it supports: <a href="{@docRoot}ndk/guides/cpu-arm-neon.html">NEON</a>, x86 +(<a href="{@docRoot}ndk/guides/x86.html">32-bit</a> and +<a href="{@docRoot}ndk/guides/x86-64.html">64-bit</a>), and +<a href="{@docRoot}ndk/guides/mips.html">MIPS</a>. Finally, it explains how to use the +<a href="{@docRoot}ndk/guides/cpu-features.html">{@code cpufeatures}</a> +library, which your app can use to query a given CPU and architecture about the optional +features they support.</p>
\ No newline at end of file diff --git a/docs/html-ndk/ndk/guides/build.jd b/docs/html-ndk/ndk/guides/build.jd index b1893fa..6286328 100644 --- a/docs/html-ndk/ndk/guides/build.jd +++ b/docs/html-ndk/ndk/guides/build.jd @@ -1,23 +1,18 @@ -page.title=Building +page.title=Building Your Project @jd:body -<div class="contents"> -<div class="textblock"><p>This section explains, in detail, how to use the NDK to build your project. It comprises the following topics:</p> -<ul> -<li><a href="./md_3__key__topics__building__chapter_1-section_8_ndk-build.html">ndk-build</a><ul> -<li>How to use the shell script that invokes the tools to build your shared libraries.</li> -</ul> -</li> -<li><a href="./md_3__key__topics__building__chapter_1-section_8__android_8mk.html">Android.mk</a><ul> -<li>Syntax for the file that describes your build sources to the build system.</li> -</ul> -</li> -<li><a href="./md_3__key__topics__building__a_p_p_l_i_c_a_t_i_o_n-_m_k.html">Application.mk</a><ul> -<li>Syntax for the file that describes the native modules that your application requires.</li> -</ul> -</li> -<li><a href="./md_3__key__topics__building__s_t_a_n_d_a_l_o_n_e-_t_o_o_l_c_h_a_i_n.html">Standalone Toolchain</a><ul> -<li>How to integrate the NDK into your existing build system. </li> -</ul> -</li> -</ul>
\ No newline at end of file +<p>One of the NDK's core purposes is allowing you to build C and C++ source code into shared +libraries that you can use in your app.</p> + +<p>This section explains how to build native binaries for use in your Android app. It begins by +explaining the +<a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a> file, which +defines properties specific to individual <i>modules</i>, or libraries. Then, it explains the +<a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file, which defines +properties for all the modules that you use in your +app. Next, it tells you how to use the <a href="{@docRoot}ndk/guides/ndk-build.html"> +{@code ndk-build}</a> script, which is what the NDK uses to build your sources. Last, it ventures +into advanced territory, discussing how to incorporate the NDK into your own +<a href="{@docRoot}ndk/guides/standalone_toolchain.html">toolchain</a>, if you prefer to +build that way instead of using +<a href="{@docRoot}ndk/guides/ndk-build.html">{@code ndk-build}</a>.</p>
\ No newline at end of file diff --git a/docs/html-ndk/ndk/guides/concepts.jd b/docs/html-ndk/ndk/guides/concepts.jd index bd4570e..c2eccd4 100644 --- a/docs/html-ndk/ndk/guides/concepts.jd +++ b/docs/html-ndk/ndk/guides/concepts.jd @@ -23,7 +23,7 @@ page.title=Concepts <li>Already familiar with concepts inherent in native programming and in <a href="{@docRoot}">Android development</a>.</li> <li>Working in <a href="{@docRoot}sdk/index.html">Eclipse, and using the Android -Development Tools ("ADT")</a>, except where otherwise noted.</li> +Development Tools (ADT)</a>, except where otherwise noted.</li> </ul> <h2 id="intro">Introduction</h2> @@ -53,14 +53,14 @@ scripts: <li>Generate binaries.</li> <li>Copy the binaries to your app's project path.</li> </ul> -<p>For more information, see the -<a href="{@docRoot}ndk/guides/ndk-build.html">ndk-build</a> section of this guide.</p> +<p>For more information, see +<a href="{@docRoot}ndk/guides/ndk-build.html">ndk-build</a>.</p> </li> </ul> <ul> <li>Java: From your Java source, the Android build process generates {@code .dex} -("Dalvik EXecutable") files, which are what the Android OS runs in the Dalvik Virtual Machine +(Dalvik EXecutable) files, which are what the Android OS runs in the Dalvik Virtual Machine (“DVM”). Even if your app contains no Java source code at all, the build process still generates a {@code .dex} executable file within which the native component runs. @@ -92,14 +92,14 @@ can link against other libraries.</li> </ul> <ul> -<li>Java Native Interface ("JNI"): The JNI is the interface via which the Java and C++ components +<li>Java Native Interface (JNI): The JNI is the interface via which the Java and C++ components talk to one another. This guide assumes knowledge of the JNI; for information about it, consult the <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/jniTOC.html"> Java Native Interface Specification</a>.</li> </ul> <ul> -<li>Application Binary Interface ("ABI"): The ABI defines exactly how your app's machine code is +<li>Application Binary Interface (ABI): The ABI defines exactly how your app's machine code is expected to interact with the system at runtime. The NDK builds {@code .so} files against these definitions. Different ABIs correspond to different architectures: The NDK includes ABI support for ARMEABI (default), MIPS, and x86. For more information, see @@ -109,9 +109,9 @@ ARMEABI (default), MIPS, and x86. For more information, see <ul> <li>Manifest: If you are writing an app with no Java component to it, you must declare the {@link android.app.NativeActivity} class in the -<a href="{@docRoot}guide/topics/manifest/manifest-intro.html">manifest</a>. The -<a href="#naa">Native Activity</a> section provides more detail on how to do this, under -“Using the native-activity.h interface.” +<a href="{@docRoot}guide/topics/manifest/manifest-intro.html">manifest</a>. +<a href="#naa">Native Activities and Applications</a> provides more detail on how to do this, under +“Using the {@code native_activity.h} interface.” </li> </ul> @@ -119,21 +119,22 @@ ARMEABI (default), MIPS, and x86. For more information, see the Android NDK as standalone compilers.</p> <ul> -<li>{@code Android.mk}: You must create an {@code Android.mk} configuration file inside your -{@code jni} folder. The ndk-build script looks at this file, which defines the module and its name, -the source files to be compiled, build flags and libraries to link. For more information, see the -<a href="{@docRoot}ndk/guides/android.mk.html">Android.mk</a> section of this document.</li> +<li>{@code Android.mk}: You must create an <a href="{@docRoot}ndk/guides/android_mk.html"> +{@code Android.mk}</a> configuration file inside your {@code jni} folder. The ndk-build script +looks at this file, which defines the module and its name, the source files to be compiled, build +flags and libraries to link.</li> </ul> <ul> -<li>{@code Application.mk}: You may optionally create an Application.mk file. This file enumerates -and describes the modules that your app requires. This information includes:<ul> +<li>{@code Application.mk}: You may optionally create an +<a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file. This file +This file enumerates and describes the modules that your app requires. This information includes: + +<ul> <li>ABIs used to compile for specific platforms.</li> <li>Toolchains.</li> <li>Standard libraries to include (static and dynamic STLport or default system).</li> </ul> -<p>For more information, see the -<a href="{@docRoot}ndk/guides/application.mk.html">Application.mk</a> section.</p> </li> </ul> @@ -152,13 +153,14 @@ to find the Android Java framework useful for tasks including controlling the di <li>Create an Android app Project in Eclipse as you would for any other Android project.</li> <li>If you are writing a native-only app, declare the {@link android.app.NativeActivity} class in {@code AndroidManifest.xml}. You can do so from the Eclipse/ADT Android Manifest Editor, or by -hand-editing the file. For more information, see the <a href="#naa">Native Activity</a> section. +hand-editing the file. For more information, see the <a href="#naa">Native Activities and +Applications</a>. </li> -<li>Create an Android.mk file describing the native library, including name, flags, linked libraries -and source files to be compiled in the ‘JNI’ directory.</li> -<li>OPTIONAL: Create an {@code Application.mk} file configuring the target ABIs, toolchain, -release/debug mode, and STL. For any of these that you do not specify, the following default values -are used, respectively: +<li>Create an {@code Android.mk} file describing the native library, including name, flags, linked +libraries, and source files to be compiled in the ‘JNI’ directory.</li> +<li>Optionally, you can create an {@code Application.mk} file configuring the target ABIs, +toolchain, release/debug mode, and STL. For any of these that you do not specify, the following +default values are used, respectively: <ul> <li> ABI: armeabi @@ -195,7 +197,7 @@ machine, sandboxed from other applications. You can therefore still access Andro through the JNI. In certain cases, however–such as for sensors, input events, and assets–the NDK provides native interfaces that you can use instead of having to call across the JNI. For more information about such support, see -<a href="{@docRoot}ndk/guides/stable-apis.html">Stable APIs</a>.</p> +<a href="{@docRoot}ndk/guides/stable_apis.html">Android NDK Native APIs</a>.</p> <p>Regardless of whether or not you are developing a native activity, we recommend that you create your projects with the traditional Android build tools. Doing so helps ensure building and packaging @@ -204,14 +206,16 @@ of Android applications with the correct structure.</p> <p>The Android NDK provides you with two choices to implement your native activity:</p> <ul> -<li>The {@code native_activity.h} header defines the native version of the +<li>The <a href="{@docRoot}ndk/reference/native__activity_8h.html">{@code native_activity.h}</a> +header defines the native version of the {@link android.app.NativeActivity} class. It contains the callback interface and data structures that you need to create your native activity. Because the main thread of your application handles the callbacks, your callback implementations must not be blocking. If they block, you might receive ANR (Application Not Responding) errors because your main thread is unresponsive until the callback returns.</li> -<li>The android_native_app_glue.h file defines a static helper library built on top of the -{@code native_activity.h} interface. It spawns another thread, which handles things such as +<li>The {@code android_native_app_glue.h} file defines a static helper library built on top of the +<a href="{@docRoot}ndk/reference/native__activity_8h.html">{@code native_activity.h}</a> interface. +It spawns another thread, which handles things such as callbacks or input events in an event loop. Moving these events to a separate thread prevents any callbacks from blocking your main thread.</li> </ul> @@ -221,9 +225,11 @@ also available, allowing you to modify the implementation.</p> <p>For more information on how to use this static library, examine the native-activity sample application and its documentation. Further reading is also available in the comments in the {@code <ndk_root>/sources/android/native_app_glue/android_native_app_glue.h} file.</p> -<h3 id="na">Using the native-activity.h interface</h3> +<h3 id="na">Using the native_activity.h interface</h3> -<p>To implement a native activity with the {@code native-activity.h} interface:</p> +<p>To implement a native activity with the +<a href="{@docRoot}ndk/reference/native__activity_8h.html">{@code native_activity.h}</a> +interface:</p> <ol type="1"> <li>Create a {@code jni/} directory in your project's root directory. This directory stores all of @@ -261,29 +267,31 @@ library containing the entry point to the application (such as C/C++ {@code main </manifest> </pre> -<li>Create a file for your native activity, and implement the {@code ANativeActivity_onCreate()} -function, which the app calls when the native activity starts. This function, analogous -to {@code main} in C/C++, receives a pointer to an {@code ANativeActivity} structure, -which contains function pointers to the various callback implementations that you need to write. -Set the applicable callback function pointers in {@code ANativeActivity->;callbacks} to the +<li>Create a file for your native activity, and implement the function named in the +<a href="{@docRoot}ndk/reference/group___native_activity.html#ga02791d0d490839055169f39fdc905c5e"> +{@code ANativeActivity_onCreate}</a> variable. +The app calls this function when the native activity starts. This function, analogous +to {@code main} in C/C++, receives a pointer to an +<a href="{@docRoot}ndk/reference/struct_a_native_activity.html">{@code ANativeActivity}</a> +structure, which contains function pointers to the various callback implementations that you need +to write. +Set the applicable callback function pointers in {@code ANativeActivity->callbacks} to the implementations of your callbacks.</li> -<!--TODO: API Ref links in the above para.--> - -<li>Set the {@code ANativeActivity->;instance} field to the address of any instance of specific +<li>Set the {@code ANativeActivity->instance} field to the address of any instance of specific data that you want to use.</li> <li>Implement anything else that you want your activity to do upon starting.</li> -<li>Implement the rest of the callbacks that you set in {@code ANativeActivity->;callbacks}. For -more information on when the callbacks are called, see the -<a href="{@docRoot}training/basics/activity-lifecycle/index.html">SDK documentation for Activity Lifecycles</a>. +<li>Implement the rest of the callbacks that you set in {@code ANativeActivity->callbacks}. For +more information on when the callbacks are called, see +<a href="{@docRoot}training/basics/activity-lifecycle/index.html">Managing the Activity +Lifecycle</a>. </li> <li>Develop the rest of your application.</li> <li>Create an {@code Android.mk file} in the {@code jni/} directory of your project to describe your -native module to the build system. For more information, see the -<a href="./md_3__key__topics__building__chapter_1-section_8__android_8mk.html">Android.mk section.</a>. -</li> -<li>Once you have an {@code Android.mk} file, compile your native code using the {@code ndk-build} -command.</li> +native module to the build system. For more information, see +<a href="{@docRoot}ndk/guides/android_mk.html">Android.mk</a>.</li> +<li>Once you have an <a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a> +file, compile your native code using the {@code ndk-build} command.</li> <pre class="no-pretty-print"> $ cd <path>/<to>/<project> @@ -295,7 +303,5 @@ the {@code jni/} directory, the build script automatically packages the {@code . from it into the APK.</li> </ol> -<p>You can find further information on using {@code native-activity.h} here.</p> -<!-- (TODO: Link to API ref guide in the above para)--> </li> </ul> diff --git a/docs/html-ndk/ndk/guides/cpp-support.jd b/docs/html-ndk/ndk/guides/cpp-support.jd index 6054181..0074b80 100644 --- a/docs/html-ndk/ndk/guides/cpp-support.jd +++ b/docs/html-ndk/ndk/guides/cpp-support.jd @@ -32,7 +32,7 @@ these helper runtimes, their characteristics, and how to use them. <p>Table 1 provides names, brief explanations, and features of runtimes available inthe NDK.</p> -<p class="table-caption" id="table1"> +<p class="table-caption" id="runtimes"> <strong>Table 1.</strong> NDK Runtimes and Features.</p> <table> @@ -114,7 +114,7 @@ APP_STL := gnustl_static For more information on how to use these runtimes with your own toolchain, see <a href="{@docRoot}ndk/guides/standalone_toolchain.html">Standalone Toolchain</a>.</p> <h2 id="rc">Runtime Characteristics</h2> -<h3 id="system">System runtime</h3> +<h3 id="system">libstdc++ (default system runtime)</h3> <p>This runtime only provides the following headers, with no support beyond them:</p> <ul> @@ -175,7 +175,7 @@ named {@code libgnustl_shared.so}.</p> shared library file is named {@code libc++_shared.so}.</p> <p>By default, this runtime compiles with {@code -std=c++11}. As with GNU {@code libstdc++}, you -need to explicitly turns on exceptions or rtti support. For information on how to do this, see +need to explicitly turns on exceptions or RTTI support. For information on how to do this, see <a href="#xp">C++ Exceptions</a> and <a href="#rt">RTTI</a>.</p> <p>The NDK provides prebuilt static and shared libraries for {@code libc++} compiled by Clang 3.4, @@ -235,9 +235,9 @@ compiles all C++ sources with {@code -fno-exceptions} support by default. You ca exceptions either for your entire app, or for individual modules. <p>To enable exception-handling support for your entire app, add the following line to -your <a href="{docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file. +your <a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file. To enable exception-handling support for individual modules', add the following line to -their respective <a href="{docRoot}ndk/guides/android.html">{@code Android.mk}</a> files.</p> +their respective <a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a> files.</p> <pre> APP_CPPFLAGS += -fexceptions @@ -249,14 +249,14 @@ that support RTTI. However, to ensure compatibility with earlier releases, it co sources with {@code -fno-rtti} by default. <p>To enable RTTI support for your entire app for your entire application, add the following line to -your <a href="{docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file: +your <a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file: <pre> APP_CPPFLAGS += -frtti </pre> To enable RTTI support for individual modules, add the following line to -their respective <a href="{docRoot}ndk/guides/android.html">{@code Android.mk}</a> files: +their respective <a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a> files: <pre> LOCAL_CPP_FEATURES += rtti @@ -303,7 +303,7 @@ before any other library that depends on it.</p> <li>libstlport_shared.so, used by both libfoo and libbar</li> </ul> -<p>You must need to load the libraries in reverse dependency order: </p> +<p>You must load the libraries in reverse dependency order: </p> <pre> static { System.loadLibrary("stlport_shared"); @@ -325,4 +325,4 @@ more information, see <a href="http://gcc.gnu.org/onlinedocs/libstdc++/manual/li License</a> on the GCC website.</p> <p><a href="https://llvm.org/svn/llvm-project/libcxx/trunk/LICENSE.TXT">LLVM {@code libc++}</a> -is dual-licensed under both the University of Illinois "BSD-Like" license and the MIT license.</p>
\ No newline at end of file +is dual-licensed under both the University of Illinois "BSD-Like" license and the MIT license.</p> diff --git a/docs/html-ndk/ndk/guides/cpu-arm-neon.jd b/docs/html-ndk/ndk/guides/cpu-arm-neon.jd index 32e9942..1d12937 100644 --- a/docs/html-ndk/ndk/guides/cpu-arm-neon.jd +++ b/docs/html-ndk/ndk/guides/cpu-arm-neon.jd @@ -27,7 +27,7 @@ at the same time.</p> <p>Not all ARMv7-based Android devices support NEON, but devices that do may benefit significantly from its support for scalar/vector instructions. For x86 devices, the NDK can also translate NEON instructions into SSE, although with several restrictions. For more information, see -<a href="{docRoot}ndk/guides/x86.html#an>x86 Support for ARM NEON Intrinsics.</a></p> +<a href="{@docRoot}ndk/guides/x86.html#an">x86 Support for ARM NEON Intrinsics.</a></p> <h2 id="ul">Using LOCAL_ARM_NEON</h2> <p>To have the NDK build all its source files with NEON support, include the following line in @@ -58,7 +58,7 @@ ARM instruction set for non-NEON instructions. In such a definition, {@code arm} <p>NEON support only works with the {@code armeabi-v7a} and {@code x86} ABIs. If the NDK build scripts encounter other ABIs while attempting to build with NEON support, the NDK build scripts exit. x86 provides <a href="x86.html">partial NEON support</a> via translation header. It is -important to use checks like the following in your <a href="{docRoot}ndk/guides/android_mk.html"> +important to use checks like the following in your <a href="{@docRoot}ndk/guides/android_mk.html"> {@code Android.mk}</a> file:</p> <pre class="no-pretty-print"> @@ -76,7 +76,7 @@ endif # TARGET_ARCH_ABI == armeabi-v7a || x86 <p>Your app must perform runtime detection to confirm that NEON-capable machine code can be run on the target device. This is because not all ARMv7-based Android devices support NEON. The app can perform this check using the -<a href="{@docRoot}ndk/guides/cpu_features.html">{@code cpufeatures}</a> library that comes with +<a href="{@docRoot}ndk/guides/cpu-features.html">{@code cpufeatures}</a> library that comes with this NDK.</p> <p>You should explicitly check that {@code android_getCpuFamily()} returns {@code diff --git a/docs/html-ndk/ndk/guides/cpu-features.jd b/docs/html-ndk/ndk/guides/cpu-features.jd index b27250a..b031909 100644 --- a/docs/html-ndk/ndk/guides/cpu-features.jd +++ b/docs/html-ndk/ndk/guides/cpu-features.jd @@ -98,7 +98,7 @@ this instruction set.</dd> <dt>{@code ANDROID_CPU_ARM_FEATURE_ARMv7}</dt> <dd>Indicates that the device's CPU supports the ARMv7-A instruction set as supported by the -<a href="{@docRoot}ndk/guides/abis.html">armeabi-v7a</a> ABI. This instruction set supports both +<a href="{@docRoot}ndk/guides/abis.html#v7a">armeabi-v7a</a> ABI. This instruction set supports both Thumb-2 and VFPv3-D16 instructions. This return value also indicates support for the VFPv3 hardware FPU instruction-set extension.</dd> diff --git a/docs/html-ndk/ndk/guides/debug.jd b/docs/html-ndk/ndk/guides/debug.jd index b202ed9..3c4da3b 100644 --- a/docs/html-ndk/ndk/guides/debug.jd +++ b/docs/html-ndk/ndk/guides/debug.jd @@ -1,17 +1,11 @@ -page.title=Debugging +page.title=Debugging Your Project @jd:body -<div class="title">Debugging </div> </div> -</div><!--header--> -<div class="contents"> -<div class="textblock"><p>This section introduces you to debugging with the NDK. It includes:</p> -<ul> -<li><a href="./md_3__key__topics__debugging__n_d_k-_g_d_b.html">ndk-gdb and ndk-gdb-py</a><ul> -<li>The helper shell script named <code>ndk-gdb</code>, which allows you to launch a native debugging session for your NDK-generated machine code.</li> -</ul> -</li> -<li><a href="./md_3__key__topics__debugging__n_d_k-_s_t_a_c_k.html">ndk-stack</a><ul> -<li>A tool that helps you use ADB <code>logcat</code> in your debugging. </li> -</ul> -</li> -</ul>
\ No newline at end of file +<p>After you've built your app, you'll probably need to debug it. This section introduces you to the +NDK's debugging tools.</p> + +<p>It begins by telling you how to use the <a href="{@docRoot}ndk/guides/ndk-gdb.html"> +{@code ndk-gdb}</a> tool to debug your code. It closes with an explanation of the +<a href="{@docRoot}ndk/guides/ndk-stack.html">{@code ndk-stack}</a> tool, which helps you use the +<a href="{@docRoot}tools/help/logcat.html">ADB logcat tool</a> +as you debug.</p>
\ No newline at end of file diff --git a/docs/html-ndk/ndk/guides/guides_toc.cs b/docs/html-ndk/ndk/guides/guides_toc.cs index 854169d..981eb51 100644 --- a/docs/html-ndk/ndk/guides/guides_toc.cs +++ b/docs/html-ndk/ndk/guides/guides_toc.cs @@ -8,64 +8,58 @@ <ul id="nav"> <li class="nav-section"> - <div class="nav-section-header"><a href="/ndk/guides/index.html"><span class="en"> - Getting Started</span></a></div> + <div class="nav-section-header"><a href="<?cs var:toroot ?>ndk/guides/index.html"> + <span class="en">Getting Started</span></a></div> <ul> - <li><a href="setup.html">Setup</a></li> - <li><a href="concepts.html">Concepts</a></li> + <li><a href="<?cs var:toroot ?>ndk/guides/setup.html">Setup</a></li> + <li><a href="<?cs var:toroot ?>ndk/guides/concepts.html">Concepts</a></li> </ul> </li> <li class="nav-section"> - <div class="nav-section-header"><a href="/ndk/guides/build.html"><span class="en"> + <div class="nav-section-header"><a href="<?cs var:toroot ?>ndk/guides/build.html"> + <span class="en"> Building</span></a></div> <ul> - <li><a href="#">ndk-build</a></li> - <li><a href="#">Android.mk</a></li> - <li><a href="#">Application.mk</a></li> - <li><a href="#">Standalone Toolchain</a></li> + <li><a href="<?cs var:toroot ?>ndk/guides/android_mk.html">Android.mk</a></li> + <li><a href="<?cs var:toroot ?>ndk/guides/application_mk.html">Application.mk</a></li> + <li><a href="<?cs var:toroot ?>ndk/guides/ndk-build.html">ndk-build</a></li> + <li><a href="<?cs var:toroot ?>ndk/guides/standalone_toolchain.html">Standalone Toolchain + </a></li> </ul> </li> <li class="nav-section"> - <div class="nav-section-header"><a href="/ndk/guides/debug.html"><span class="en"> - Debugging</span></a></div> + <div class="nav-section-header"><a href="<?cs var:toroot ?>ndk/guides/arch.html"> + <span class="en">Architectures and CPUs</span></a></div> <ul> - <li><a href="#">ndk-gdb</a></li> - <li><a href="#">ndk-stack</a></li> + <li><a href="<?cs var:toroot ?>ndk/guides/abis.html">ABI Management</a></li> + <li><a href="<?cs var:toroot ?>ndk/guides/cpu-arm-neon.html">NEON</a></li> + <li><a href="<?cs var:toroot ?>ndk/guides/x86.html">x86</a></li> + <li><a href="<?cs var:toroot ?>ndk/guides/x86-64.html">x86-64</a></li> + <li><a href="<?cs var:toroot ?>ndk/guides/mips.html">MIPS</a></li> + <li><a href="<?cs var:toroot ?>ndk/guides/cpu-features.html">The cpufeatures Library</a> + </li> </ul> </li> <li class="nav-section"> - <div class="nav-section-header"><a href="/ndk/guides/arch.html"><span class="en"> - Architectures and CPUs</span></a></div> + <div class="nav-section-header"><a href="<?cs var:toroot ?>ndk/guides/debug.html"> + <span class="en">Debugging</span></a></div> <ul> - <li><a href="#">ABI Management</a></li> - <li><a href="#">Neon</a></li> - <li><a href="#">Mips</a></li> - <li><a href="#">x86</a></li> - <li><a href="#">x86-64</a></li> - <li><a href="#">CPU Features</a></li> + <li><a href="<?cs var:toroot ?>ndk/guides/ndk-gdb.html">ndk-gdb</a></li> + <li><a href="<?cs var:toroot ?>ndk/guides/ndk-stack.html">ndk-stack</a></li> </ul> </li> <li class="nav-section"> - <div class="nav-section-header"><a href="/ndk/guides/libs.html"><span class="en"> - Libraries</span></a></div> + <div class="nav-section-header"><a href="<?cs var:toroot ?>ndk/guides/libs.html"> + <span class="en">Libraries</span></a></div> <ul> - <li><a href="#">Stable APIs</a></li> - <li><a href="#">C++ Support</a></li> - <li><a href="#">Prebuilt Libraries</a></li> - </ul> - </li> + <li><a href="<?cs var:toroot ?>ndk/guides/prebuilts.html">Prebuilt Libraries</a></li> + <li><a href="<?cs var:toroot ?>ndk/guides/cpp-support.html">C++ Support</a></li> + <li><a href="<?cs var:toroot ?>ndk/guides/stable_apis.html">Stable APIs</a></li> - <li class="nav-section"> - <div class="nav-section-header"><a href="/ndk/guides/sample.html"><span class="en"> - Sample Walkthrough</span></a></div> - <ul> - <li><a href="#">hello-jni</a></li> - <li><a href="#">native-activity</a></li> - <li><a href="#">Teapot</a></li> </ul> </li> diff --git a/docs/html-ndk/ndk/guides/index.jd b/docs/html-ndk/ndk/guides/index.jd index 3fbfb47..465ce13 100644 --- a/docs/html-ndk/ndk/guides/index.jd +++ b/docs/html-ndk/ndk/guides/index.jd @@ -1,17 +1,25 @@ -page.title=Getting Started +page.title=Getting Started with the NDK @jd:body -<p>This section provides the information you need to get up and running -with the NDK.</p> +<p>The Native Development Kit (NDK) is a set of tools that allow you to leverage C and +C++ code in your Android apps. You can use it either to build from your own source code, or to take +advantage of existing prebuilt libraries.</p> + +<p>The NDK is not appropriate for most novice Android programmers, and has little value for many +types of Android apps. It is often not worth the additional complexity it inevitably brings to the +development process. However, it can be useful in cases in which you need to:</p> + <ul> - <li><a href="setup.html">Setup</a></li> - <ul> - <li>Learn how to set up the NDK, and verify that it's integrated into - your toolchain.</li> - </ul> - <li><a href="concepts.html">Concepts</a></li> - <ul> - <li>Learn some basics about how the NDK works and its components, and about how to use it. - </li> - </ul> + <li>Squeeze extra performance out of a device for computationally intensive applications like + games or physics simulations.</li> + <li>Reuse your own or other developers' C or C++ libraries.</li> </ul> + +<p>This guide gives you the information you need to get up and running with the NDK. It starts by +explaining the <a href="{@docRoot}ndk/guides/concepts.html">concepts</a> underpinning the NDK, and +how to <a href="{@docRoot}ndk/guides/setup.html">set it up</a>. Next, it continues with information +about targeting <a href="{@docRoot}ndk/guides/arch.html">different hardware platforms</a> in your +builds. Then, it explains how to use +the NDK to <a href="{@docRoot}ndk/guides/build.html">build</a> and +<a href="{@docRoot}ndk/guides/debug.html">debug</a> your app. Finally, it discusses how to use your +own and other prebuilt <a href="{@docRoot}ndk/guides/libs.html">libraries</a>.</p> diff --git a/docs/html-ndk/ndk/guides/libs.jd b/docs/html-ndk/ndk/guides/libs.jd index 1d4d2ac..ea607de 100644 --- a/docs/html-ndk/ndk/guides/libs.jd +++ b/docs/html-ndk/ndk/guides/libs.jd @@ -1,20 +1,13 @@ -page.title=Libraries +page.title=Using Existing Libraries @jd:body -<div class="contents"> -<div class="textblock"><p>This section discusses libraries included with the NDK, as well as how to use other people's libraries and modules in your own application. It discusses:</p> -<ul> -<li><a href="./md_3__key__topics__libraries__s_t_a_b_l_e-_a_p_i_s.html">Stable APIs</a><ul> -<li>This section discusses the stable APIs exposed by the NDK.</li> -</ul> -</li> -<li><a href="./md_3__key__topics__libraries__p_r_e_b_u_i_l_t_s.html">Prebuilt Libraries</a><ul> -<li>How to include and use prebuilt libraries in your own application.</li> -</ul> -</li> -<li><a href="./md_3__key__topics__libraries__c_p_l_u_s_p_l_u_s-_s_u_p_p_o_r_t.html">C++ Support</a><br/> -<ul> -<li>Information about the NDK's C++ runtime support library and corresponding header files. </li> -</ul> -</li> -</ul>
\ No newline at end of file +<p>This section discusses the use of existing libraries–both your own, and those that the NDK +provides.</p> + +<p>It begins by telling you how to use your own <a href="{@docRoot}ndk/guides/prebuilts.html"> +prebuilt libraries</a>. Then, it explains the <a href="{@docRoot}ndk/guides/cpp-support.html"> +C++ helper runtimes</a> available with the NDK, and how to use them. Finally, it provides +information on <a href="{@docRoot}ndk/guides/stable_apis.html">the other libraries</a> that the NDK provides, such +as <a href="https://www.khronos.org/opengles/">OpenGL ES</a> and +<a href="https://www.khronos.org/opensles/">OpenSL ES</a>, and the minimum Android API levels +required to support those libraries.</p>
\ No newline at end of file diff --git a/docs/html-ndk/ndk/guides/mips.jd b/docs/html-ndk/ndk/guides/mips.jd index 1aa1868..2b4eea4 100644 --- a/docs/html-ndk/ndk/guides/mips.jd +++ b/docs/html-ndk/ndk/guides/mips.jd @@ -29,7 +29,7 @@ APP_ABI := mips <p>The build system places generated libraries into {@code $PROJECT/libs/mips/}, where {@code $PROJECT} represents your project's root directory, and embeds them in your APK under -{@code /lib/mips/}.</p> +the {@code /lib/mips/} directory.</p> <p>The Android package manager extracts these libraries when installing your APK on a compatible MIPS-based device, placing them under your app's private data directory.</p> diff --git a/docs/html-ndk/ndk/guides/ndk-build.jd b/docs/html-ndk/ndk/guides/ndk-build.jd index d52d224..9e3edda 100644 --- a/docs/html-ndk/ndk/guides/ndk-build.jd +++ b/docs/html-ndk/ndk/guides/ndk-build.jd @@ -9,7 +9,7 @@ page.title=ndk-build <li><a href="#int">Internals</a></li> <li><a href="#ifc">Invoking from the Command Line</a></li> <li><a href="#ife">Invoking from Eclipse</a></li> - <li><a href="#6432">64-bit and 32-bit toolchains</a></li> + <li><a href="#6432">64-Bit and 32-Bit Toolchains</a></li> <li><a href="#req">Requirements</a></li> </ol> </li> @@ -17,12 +17,12 @@ page.title=ndk-build </div> </div> -<p>ndk-build is a tiny shell script introduced in Android NDK r4. Its purpose -is simply to invoke the right NDK build script. +<p>The {@code ndk-build} file is a shell script introduced in Android NDK r4. Its purpose +is to invoke the right NDK build script. <h2 id="int">Internals</h2> -ndk-build is equivalent to: </p> +<p>Running the {@code ndk-build} script is equivalent to running the following command:</p> <pre class="no-pretty-print"> $GNUMAKE -f <ndk>/build/core/build-local.mk @@ -35,8 +35,8 @@ this information to invoke ndk-build from other shell scripts, or even your own make files.</p> <h2 id="ifc">Invoking from the Command Line</h2> -<p>ndk-build lives in the top level the NDK installation directory. To run it from the -command line, invoke it while in or under your application project directory. +<p>The {@code ndk-build} file lives in the top level the NDK installation directory. To run it +from the command line, invoke it while in or under your application project directory. For example: </p> <pre class="no-pretty-print"> @@ -132,7 +132,7 @@ results of each possible combination of settings.</p> Optimized*3 </td></tr> </table> *1: Useful for profiling.<br> -*2: Default for running <a href="{@docRoot}ndk/guides/"ndk-gdb.html">ndk-gdb</a>.<br> +*2: Default for running <a href="{@docRoot}ndk/guides/ndk-gdb.html">{@code ndk-gdb}</a>.<br> *3: Default mode.<br> <br> <p class="note"><strong>Note:</strong> {@code NDK_DEBUG=0} is the equivalent of @@ -159,7 +159,7 @@ From SDK r8 onward, you do not need to touch {@code AndroidManifest.xml}. Buildi pick the native debug files generated with {@code NDK_DEBUG=1}. -<h2 id="6432">64-bit and 32-bit toolchains</h2> +<h2 id="6432">64-Bit and 32-Bit Toolchains</h2> <p>Some toolchains come with both 64-bit and 32-bit versions. For example, directories {@code <ndk>/toolchain/<name>/prebuilt/} and {@code <ndk>/prebuilt/} may contain both {@code linux-x86} and diff --git a/docs/html-ndk/ndk/guides/ndk-gdb.jd b/docs/html-ndk/ndk/guides/ndk-gdb.jd index 2370ba2..b15e67e 100644 --- a/docs/html-ndk/ndk/guides/ndk-gdb.jd +++ b/docs/html-ndk/ndk/guides/ndk-gdb.jd @@ -29,12 +29,12 @@ true}.</li> <li>Build your app to run on Android 2.2 (Android API level 8) or higher.</li> <li>Debug on a device or emulator running Android 2.2 or higher. For debugging purposes, the target API level that you declare in your {@code AndroidManifest.xml} file does not matter.</li> -<li>Develop your app in a Unix shell. On Windows, use <a href="https://www.cygwin.com/">Cygwin +<li>Develop your app in a Unix shell. On Windows, use <a href="https://www.cygwin.com/">Cygwin</a> or the experimental {@code ndk-gdb-py} <a href="https://www.python.org/">Python</a> implementation.</li> <li>Use GNU Make 3.81 or higher.</li> <li>If you are building your app from -<a href="http://developer.android.com/sdk/installing/installing-adt.html">Eclipse</a>, build it +<a href="{@docRoot}sdk/installing/installing-adt.html">Eclipse</a>, build it using version 0.9.7 or higher of the ADT plug-in.</li> <h2 id="use">Usage</h2> @@ -150,7 +150,7 @@ line.</p> <tr> <td>{@code --adb=<file>}</td> -<td><p>This option specifies the <a href="http://developer.android.com/tools/help/adb.html">adb</a> +<td><p>This option specifies the <a href="{@docRoot}tools/help/adb.html">adb</a> tool executable. It is only necessary if you have not set your path to include that executable.</p> </td> </tr> diff --git a/docs/html-ndk/ndk/guides/ndk-stack.jd b/docs/html-ndk/ndk/guides/ndk-stack.jd index 27c752a..46146cb 100644 --- a/docs/html-ndk/ndk/guides/ndk-stack.jd +++ b/docs/html-ndk/ndk/guides/ndk-stack.jd @@ -12,8 +12,10 @@ page.title=ndk-stack </div> <p>The {@code ndk-stack} tool allows you to filter stack traces as they appear in the -output of {@code adb logcat}, and replace any address inside a shared library with the corresponding -{@code <source-file>:<line-number>} values.</p> +output of <a href="{@docRoot}tools/help/logcat.html">{@code adb logcat}</a>. It also replaces any +address inside a shared library with the corresponding +{@code <source-file>:<line-number>} values from your source code, making issues easier +to pinpoint.</p> <p>For example, it translates something like:</p> @@ -36,7 +38,7 @@ I/DEBUG ( 31): #06 pc 0000d362 /system/lib/libc.so I/DEBUG ( 31): </pre> -<p>Into the more readable output: </p> +<p>into the more readable output: </p> <pre> ********** Crash dump: ********** diff --git a/docs/html-ndk/ndk/guides/prebuilts.jd b/docs/html-ndk/ndk/guides/prebuilts.jd index f0530d1..f13e70e 100644 --- a/docs/html-ndk/ndk/guides/prebuilts.jd +++ b/docs/html-ndk/ndk/guides/prebuilts.jd @@ -42,7 +42,7 @@ use cases for this functionality:</p> whether you are using a shared ({@code .so}) or static {@code .a}) library.</li> </ol> - <p>Here is a trivial example that assumes that the prebuilt library {@code libfoo.so} resides in + <p>Here is a trivial example that assumes the prebuilt library {@code libfoo.so} resides in the same directory as the <a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a> file that describes it.</p> @@ -142,4 +142,4 @@ include $(PREBUILT_SHARED_LIBRARY) <p>If you have specified {@code armeabi} as the value of {@code TARGET_ARCH_ABI}, the build system uses the version of {@code libfoo.so} located in the {@code armeabi} directory. If you have specified {@code x86} as the value {@code TARGET_ARCH_ABI}, the build system uses the version in the -{@code x86} directory.</p>
\ No newline at end of file +{@code x86} directory.</p> diff --git a/docs/html-ndk/ndk/guides/setup.html b/docs/html-ndk/ndk/guides/setup.html deleted file mode 100644 index 0b44132..0000000 --- a/docs/html-ndk/ndk/guides/setup.html +++ /dev/null @@ -1,520 +0,0 @@ -<!DOCTYPE html> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -<html> -<head> - - -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="viewport" content="width=device-width" /> - -<meta name="Description" content="This document explains how to: This document assumes that you are already familiar with Java-based Android development. For more information on that topic, see the Android developer site . To install and configure the NDK, follow these steps: Eclipse …"> -<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> -<title>Setup | Android Developers</title> - -<!-- STYLESHEETS --> -<link rel="stylesheet" -href="//fonts.googleapis.com/css?family=Roboto+Condensed"> -<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:light,regular,medium,thin,italic,mediumitalic,bold" - title="roboto"> -<link href="/assets/css/default.css?v=5" rel="stylesheet" type="text/css"> - -<!-- JAVASCRIPT --> -<script src="//www.google.com/jsapi" type="text/javascript"></script> -<script src="/assets/js/android_3p-bundle.js" type="text/javascript"></script> -<script type="text/javascript"> - var toRoot = "/"; - var metaTags = []; - var devsite = false; -</script> -<script src="/assets/js/docs.js?v=3" type="text/javascript"></script> - - - -<script> - (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ - (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), - m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) - })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); - - ga('create', 'UA-5831155-1', 'android.com'); - ga('create', 'UA-49880327-2', 'android.com', {'name': 'universal'}); // New tracker); - ga('send', 'pageview'); - ga('universal.send', 'pageview'); // Send page view for new tracker. -</script> - -</head> - -<body class="gc-documentation develop guide" itemscope itemtype="http://schema.org/Article"> - -<a name="top"></a> - -<!-- dialog to prompt lang pref change when loaded from hardcoded URL -<div id="langMessage" style="display:none"> - <div> - <div class="lang en"> - <p>You requested a page in English, would you like to proceed with this language setting?</p> - </div> - <div class="lang es"> - <p>You requested a page in Spanish (Español), would you like to proceed with this language setting?</p> - </div> - <div class="lang ja"> - <p>You requested a page in Japanese (日本語), would you like to proceed with this language setting?</p> - </div> - <div class="lang ko"> - <p>You requested a page in Korean (한국어), would you like to proceed with this language setting?</p> - </div> - <div class="lang ru"> - <p>You requested a page in Russian (Русский), would you like to proceed with this language setting?</p> - </div> - <div class="lang zh-cn"> - <p>You requested a page in Simplified Chinese (简体中文), would you like to proceed with this language setting?</p> - </div> - <div class="lang zh-tw"> - <p>You requested a page in Traditional Chinese (繁體中文), would you like to proceed with this language setting?</p> - </div> - <a href="#" class="button yes" onclick="return false;"> - <span class="lang en">Yes</span> - <span class="lang es">Sí</span> - <span class="lang ja">Yes</span> - <span class="lang ko">Yes</span> - <span class="lang ru">Yes</span> - <span class="lang zh-cn">是的</span> - <span class="lang zh-tw">没有</span> - </a> - <a href="#" class="button" onclick="$('#langMessage').hide();return false;"> - <span class="lang en">No</span> - <span class="lang es">No</span> - <span class="lang ja">No</span> - <span class="lang ko">No</span> - <span class="lang ru">No</span> - <span class="lang zh-cn">没有</span> - <span class="lang zh-tw">没有</span> - </a> - </div> -</div> --> - - - <!-- Header --> - <div id="header-wrapper"> - <div id="header"> - - - - - <div class="wrap" id="header-wrap"> - <div class="col-3 logo"> - <a href="/index.html"> - <img src="/assets/images/dac_logo.png" - srcset="/assets/images/dac_logo@2x.png 2x" - width="123" height="25" alt="Android Developers" /> - </a> - <div class="btn-quicknav" id="btn-quicknav"> - <a href="#" class="arrow-inactive">Quicknav</a> - <a href="#" class="arrow-active">Quicknav</a> - </div> - </div> - - - - - - </div><!-- end header-wrap.wrap --> - </div><!-- end header --> - - - <!-- Secondary x-nav --> - <div id="nav-x"> - <div class="wrap" style="position:relative;z-index:1"> - - <ul class="nav-x col-9 develop" style="width:100%"> - <li class="guide"><a href="/ndk/guides/index.html"> - Guides</a></li> - <li class="reference"><a href="/ndk/reference/index.html"> - Reference</a></li> - <li class="samples"><a href="/ndk/samples/index.html"> - Samples</a></li> - <li class="downloads"><a href="/ndk/downloads/index.html"> - Downloads</a></li> - </li> - </ul> - </div> - </div> - - - <div id="searchResults" class="wrap" style="display:none;"> - <h2 id="searchTitle">Results</h2> - <div id="leftSearchControl" class="search-control">Loading...</div> - </div> - </div> <!--end header-wrapper --> - - <div id="sticky-header"> - <div> - <a class="logo" href="#top"></a> - <a class="top" href="#top"></a> - <ul class="breadcrumb"> - - <li class="current">Setup</li> - </ul> - </div> - </div> - - - - - <div class="wrap clearfix" id="body-content"> - <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> - <div id="devdoc-nav" class="scroll-pane"> - - - -<ul id="nav"> -<li><strong>NDK</strong> - <ul> - <li><a href="/ndk/guides/index.html"><span class="en">Getting Started</span></a> - <ul> - <li><a href="setup.html">Setup</a></li> - <li><a href="concepts.html">Concepts</a></li> - </ul></li> - <li><a href="/ndk/guides/build.html"><span class="en">Building</span></a> - <ul> - <li><a href="">ndk-build</a></li> - <li><a href="">Android.mk</a></li> - <li><a href="">Application.mk</a></li> - <li><a href="">Standalone Toolchain</a></li> - </ul></li> - <li><a href="/ndk/guides/debug.html"><span class="en">Debugging</span></a> - <ul> - <li><a href="">ndk-gdb</a></li> - <li><a href="">ndk-stack</a></li> - </ul></li> - <li><a href="/ndk/guides/arch.html"><span class="en">Architectures and CPUs</span></a> - <ul> - <li><a href="">ABI Management</a></li> - <li><a href="">Neon</a></li> - <li><a href="">Mips</a></li> - <li><a href="">x86</a></li> - <li><a href="">x86-64</a></li> - <li><a href="">CPU Features</a></li> - </ul></li> - <li><a href="/ndk/guides/libs.html"><span class="en">Libraries</span></a> - <ul> - <li><a href="">Stable APIs</a></li> - <li><a href="">C++ Support</a></li> - <li><a href="">Prebuilt Libraries</a></li> - </ul></li> - <li><a href="/ndk/guides/sample.html"><span class="en">Sample Walkthrough</span></a> - <ul> - <li><a href="">hello-jni</a></li> - <li><a href="">native-activity</a></li> - <li><a href="">Teapot</a></li> - </ul></li> - <li><a href="/ndk/guides/atomics.html"><span class="en">Atomics</span></a></li> - <li><a href="/ndk/guides/importing.html"><span class="en">Importing Modules</span></a></li> - <li><a href="/ndk/guides/depends.html"><span class="en">ndk-depends</span></a></li> - <li><a href="/ndk/guides/system.html"><span class="en">System Image Issues</span></a></li> - <li><a href="/ndk/guides/licenses.html"><span class="en">Licenses</span></a></li> - </ul></li> -<li><strong>Radiance</strong> - <ul> - <li><a href="/ndk/guides/null.html"><span class="en">Stub 1</span></a> - <ul> - <li><a href="">Stublet</a></li> - <li><a href="">Stublet</a></li> - </ul></li> - <li><a href="/ndk/guides/null.html"><span class="en">Stub 2, etc.</span></a> - <ul> - <li><a href="">Another Stublet</a></li> - <li><a href="">Another Stublet</a></li> - </ul></li> - </ul></li> -</ul> - - -<script type="text/javascript"> -<!-- - buildToggleLists(); - changeNavLang(getLangPref()); -//--> -</script> - - - - - </div> - </div> <!-- end side-nav --> - <script> - $(document).ready(function() { - scrollIntoView("devdoc-nav"); - }); - </script> - - - - -<div class="col-12" id="doc-col" > - - - - - - - - <h1 itemprop="name" >Setup</h1> - - - - - - - <div id="jd-content"> - - - <div class="jd-descr" itemprop="articleBody"> - <div id="qv-wrapper"> - <div id="qv"> - <h2>On this page</h2> - - <ol> - <li><a href="#install">Installation</a></li> - <li><a href="#configure">Configuring Eclipse</a></li> - <li><a href="#verify">Verification</a></li> - </ol> - </li> - </ol> - </div> - </div> - - -<div class="contents"> -<div class="textblock"><p>This document explains how to:</p> -<ul> -<li><a href="#install">Get</a> and install the NDK.</li> -<li><a href="#configure">Configure</a> your system and the Eclipse and the Android Development Tool -(ADT) for use with it.</li> -<li><a href="#verify">Verify</a>, using a simple sample, that everything is working as expected. -</li> -</ul> -<p>This document assumes that you are already familiar with Java-based Android development. For more -information on that topic, see the -<a href="/">Android developer site</a>.</p> - -<h2 id="install">Installation</h2> -<p>To install and configure the NDK, follow these steps:</p> -<ol type="1"> -<li>Get and install the <a href="/sdk/index.html">Android SDK</a>.if you -have not already done so.</li> -<li><a href="/tools/sdk/ndk/index.html">Download</a> and unzip the NDK, -making sure to download the correct version for your development platform. You may place the -unzipped directory anywhere on your local drive.</li> -<li>Update your <code>PATH</code> environment variable with the location of the directory that -contains the NDK.</li> -</ol> - - -<h2 id="configure">Configuring Eclipse</h2> -<p>Eclipse must know where the NDK is in order to use it when building your app. Follow these steps -to set the location of the NDK.</p> -<ol type="1"> -<li>Launch Eclipse, which is installed as part of the Android SDK.</li> -<li>Open <b>Window</b> > <b>Preferences</b>.</li> -<li>In the pane on the left side of the <i>Preferences</i> window, select <i>Android</i>. -The <i>Android</i> section expands, revealing a number of subsections.</li> -<li>Select <b>NDK</b>. In the pane on the right side of the <i>Preferences</i> window, browse to -the directory that contains the NDK.</li> -<li>Click <b>OK</b> to return to the <i>Package Explorer</i> display.</li> -</ol> - -<h2 id="verify">Verification</h2> -<h3>Eclipse</h3> -<p>To confirm that you have installed the NDK, set it up correctly, and properly configured Eclipse, -follow these steps:</p> -<ol type="1"> -<li>Import the hello-jni sample from <code><ndk>/samples/</code>, as you would any other Android -project.</li> -<li>In the <i>Project Explorer</i> pane, right-click the project name (<i>HelloJni</i>). A -context menu appears.</li> -<li>From the context menu, select <b>Android Tools</b> > <b>Add Native Support</b>. The -<i>Add Android Native Support</i> window appears.</li> -<li>Accept the default library name (“hello-jni”), and click <b>Finish</b>.</li> -<li>Build and execute the application.</li> -</ol> -<h3>Command line</h3> -<p>Follow these steps to build from the command line:</p> -<ol type="1"> -<li>Change to the root directory of your project.</li> -<li>Execute ndk-build to build the native component of your app. do this by -typing <code>ndk-build</code> at the command prompt.</li> -<li>Build and install your project as you would a regular Android app written in Java. For more -information, see -<a href="/tools/building/index.html">Building and Running</a> and -<a href="/tools/building/building-cmdline.html">Building and Running -from the Command Line</a>.</li> -</ol> - -<p>If you have successfully installed and configured the NDK, the screen on your target device looks -as shown in Figure 1.</p> - -<img src="./images/verification_screen.png" srcset="./images/verification_screen@2x.png 2x" alt="Output: Hello from JNI!" id="figure2" /> - -<p class="img-caption"> -<strong>Figure 1.</strong> Target-device screen after successful launch. -</p> - - </div> - - <div class="content-footer layout-content-row" - itemscope itemtype="http://schema.org/SiteNavigationElement"> - - <div class="paging-links layout-content-col col-10"> - - </div> - <div class="layout-content-col plus-container col-2" > - - <div class="g-plusone" data-size="medium"></div> - - </div> - - </div> - - </div> <!-- end jd-content --> - -<div id="footer" class="wrap" > - - - <div id="copyright"> - - Except as noted, this content is - licensed under <a href="http://creativecommons.org/licenses/by/2.5/"> - Creative Commons Attribution 2.5</a>. For details and - restrictions, see the <a href="/license.html">Content - License</a>. - </div> - - - <div id="footerlinks"> - - <p> - <a href="/about/index.html">About Android</a> | - <a href="/legal.html">Legal</a> | - <a href="/support.html">Support</a> - </p> - </div> - -</div> <!-- end footer --> -</div><!-- end doc-content --> - -</div> <!-- end body-content --> - - - - - - <script src="https://developer.android.com/ytblogger_lists_unified.js" type="text/javascript"></script> - <script src="/jd_lists_unified.js?v=8" type="text/javascript"></script> - <script src="/jd_extras.js?v=10" type="text/javascript"></script> - <script src="/jd_collections.js?v=10" type="text/javascript"></script> - <script src="/jd_tag_helpers.js?v=5" type="text/javascript"></script> - -</body> -</html> - - - diff --git a/docs/html-ndk/ndk/guides/setup.jd b/docs/html-ndk/ndk/guides/setup.jd new file mode 100644 index 0000000..81a33c0 --- /dev/null +++ b/docs/html-ndk/ndk/guides/setup.jd @@ -0,0 +1,94 @@ +page.title=Setup +@jd:body + + +<div id="qv-wrapper"> + <div id="qv"> + <h2>On this page</h2> + + <ol> + <li><a href="#install">Installation</a></li> + <li><a href="#configure">Configuring Eclipse</a></li> + <li><a href="#verify">Verification</a></li> + </ol> + </li> + </ol> + </div> + </div> + + +<div class="contents"> +<div class="textblock"><p>This document explains how to:</p> +<ul> +<li><a href="#install">Get</a> and install the NDK.</li> +<li><a href="#configure">Configure</a> your system and the Eclipse and the Android Development Tool +(ADT) for use with it.</li> +<li><a href="#verify">Verify</a>, using a simple sample, that everything is working as expected. +</li> +</ul> +<p>This document assumes that you are already familiar with Java-based Android development. For more +information on that topic, see the +<a href="{@docRoot}">Android developer site</a>.</p> + +<h2 id="install">Installation</h2> +<p>To install and configure the NDK, follow these steps:</p> +<ol type="1"> +<li>Get and install the <a href="{@docRoot}sdk/index.html">Android SDK</a>.</li> +<li><a href="{@docRoot}ndk/downloads/index.html">Download</a> and +<a href="{@docRoot}ndk/downloads/index.html#extract">extract</a> the NDK, +making sure to download the correct version for your development platform. You may place the +unzipped directory anywhere on your local drive.</li> +<li>Update your {@code PATH} environment variable with the location of the directory that +contains the NDK.</li> +</ol> + + +<h2 id="configure">Configuring Eclipse</h2> +<p>Eclipse must know where the NDK is in order to use it when building your app. Follow these steps +to set the location of the NDK.</p> +<ol type="1"> +<li>Launch Eclipse, which is installed as part of the Android SDK.</li> +<li>Open <b>Window</b> > <b>Preferences</b>.</li> +<li>In the pane on the left side of the <i>Preferences</i> window, select <i>Android</i>. +The <i>Android</i> section expands, revealing a number of subsections.</li> +<li>Select <b>NDK</b>. In the pane on the right side of the <i>Preferences</i> window, browse to +the directory that contains the NDK.</li> +<li>Click <b>OK</b> to return to the <i>Package Explorer</i> display.</li> +</ol> + +<h2 id="verify">Verification</h2> +<h3>Eclipse</h3> +<p>To confirm that you have installed the NDK, set it up correctly, and properly configured Eclipse, +follow these steps:</p> +<ol type="1"> +<li>Import the hello-jni sample from {@code <ndk>/samples/}, as you would any other Android +project.</li> +<li>In the <i>Project Explorer</i> pane, right-click the project name (<i>HelloJni</i>). A +context menu appears.</li> +<li>From the context menu, select <b>Android Tools</b> > <b>Add Native Support</b>. The +<i>Add Android Native Support</i> window appears.</li> +<li>Accept the default library name (“hello-jni”), and click <b>Finish</b>.</li> +<li>Build and execute the application.</li> +</ol> +<h3>Command line</h3> +<p>Follow these steps to build from the command line:</p> +<ol type="1"> +<li>Change to the root directory of your project.</li> +<li>Execute ndk-build to build the native component of your app. do this by +typing {@code ndk-build} at the command prompt.</li> +<li>Build and install your project as you would a regular Android app written in Java. For more +information, see +<a href="{@docRoot}tools/building/index.html">Building and Running</a> and +<a href="{@docRoot}tools/building/building-cmdline.html">Building and Running +from the Command Line</a>.</li> +</ol> + +<p>If you have successfully installed and configured the NDK, the screen on your target device looks +as shown in Figure 1.</p> + +<img src="./images/verification_screen.png" srcset="./images/verification_screen@2x.png 2x" +alt="Output: Hello from JNI!" id="figure1" /> + +<p class="img-caption"> +<strong>Figure 1.</strong> Target-device screen after successful launch. +</p> diff --git a/docs/html-ndk/ndk/guides/stable_apis.jd b/docs/html-ndk/ndk/guides/stable_apis.jd index a3fedcc..cad02ac 100644 --- a/docs/html-ndk/ndk/guides/stable_apis.jd +++ b/docs/html-ndk/ndk/guides/stable_apis.jd @@ -58,7 +58,7 @@ under {@code $NDK/platforms/android-<level>/<abi>/usr/include}. When have a specific new group of headers and libraries for an Android API level, it means that an app targeting that level should use the most recently released NDK assets. For example, there was no new release of NDK headers or libraries for Android API levels 6 and 7. Therefore, -when developing an app targeting Android API level 7, you would use the headers and libraries +when developing an app targeting Android API level 7, you should use the headers and libraries located under {@code android-5/}.</p> <p>Table 1 shows the correspondence between NDK-supported API levels and Android releases.</p> diff --git a/docs/html-ndk/ndk/guides/standalone_toolchain.jd b/docs/html-ndk/ndk/guides/standalone_toolchain.jd index f3777f3..895f0fc 100644 --- a/docs/html-ndk/ndk/guides/standalone_toolchain.jd +++ b/docs/html-ndk/ndk/guides/standalone_toolchain.jd @@ -29,7 +29,7 @@ compiling, linking, and low-level architecture. In addition, the techniques it d unnecessary for most use cases. In most cases, we recommend that you forego using a standalone toolchain, and instead stick to the NDK build system.</p> -<h2 id="syt">Selecting your Toolchain</h2> +<h2 id="syt">Selecting Your Toolchain</h2> <p>Before anything else, you need to decide which processing architecture your standalone toolchain is going to target. Each architecture corresponds to a different toolchain name, as Table 1 shows.</p> @@ -69,7 +69,7 @@ shows.</p> -<h2 id="sys">Selecting your Sysroot</h2> +<h2 id="sys">Selecting Your Sysroot</h2> <p>The next thing you need to do is define your <i>sysroot</i> (A sysroot is a directory containing the system headers and libraries for your target). To define the sysroot, you must must know the Android API level you want to target for native support; available native APIs vary by Android API @@ -78,15 +78,15 @@ level.</p> <p>Native APIs for the respective <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html"> Android API levels</a> reside under {@code $NDK/platforms/}; each API-level directory, in turn, contains subdirectories for the various CPUs and architectures. The -following example shows how to define a <em>sysroot</em> for a build targeting Android 5.1 -(API level 22), for ARM architecture:</p> +following example shows how to define a <em>sysroot</em> for a build targeting Android 5.0 +(API level 21), for ARM architecture:</p> <pre class="no-pretty-print"> -SYSROOT=$NDK/platforms/android-22/arch-arm +SYSROOT=$NDK/platforms/android-21/arch-arm </pre> For more detail about the Android API levels and the respective native APIs they support, see -<a href={docRoot}ndk/guides/stable_apis.html>Stable APIs</a>. +<a href={@docRoot}ndk/guides/stable_apis.html>Android NDK Native APIs</a>. <h2 id="itc">Invoking the Compiler</h2> @@ -120,19 +120,27 @@ $CC -o foo.o -c foo.c <th scope="col">Value</th> </tr> <tr> + <td>armeabi</td> + <td>{@code -target armv5te-none-linux-androideabi}</td> + </tr> + <tr> <td>armeabi-v7a</td> <td>{@code -target armv7-none-linux-androideabi}</td> </tr> <tr> - <td>armeabi</td> - <td>{@code -target armv5te-none-linux-androideabi}</td> + <td>arm64-v8a</td> + <td>{@code -target aarch64-none-linux-android}</td> </tr> - <tr> + <tr> <td>x86</td> <td>{@code -target i686-none-linux-android}</td> </tr> - <tr> - <td>MIPS</td> + <tr> + <td>x86_64</td> + <td>{@code -target x86_64-none-linux-android}</td> + </tr> + <tr> + <td>mips</td> <td>{@code -target mipsel-none-linux-android}</td> </tr> </table> @@ -147,7 +155,7 @@ following example:</li> Ultimately, a command to compile using Clang might look like this: <pre class="no-pretty-print"> -export CC="export CC="$NDK/toolchains/arm-linux-androideabi-4.8/prebuilt/ \ +export CC="$NDK/toolchains/arm-linux-androideabi-4.8/prebuilt/ \ linux-x86/bin/arm-linux-androideabi-gcc-4.8 --sysroot=$SYSROOT" -target \ armv7-none-linux-androideabi \ -gcc-toolchain $NDK/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64" @@ -165,11 +173,11 @@ installation root for the NDK. An example of the use of this script appears belo <pre class="no-pretty-print"> $NDK/build/tools/make-standalone-toolchain.sh \ ---arch=arm --platform=android-22 --install-dir=/tmp/my-android-toolchain +--arch=arm --platform=android-21 --install-dir=/tmp/my-android-toolchain </pre> <p>This command creates a directory named {@code /tmp/my-android-toolchain/}, containing a copy of -the {@code android-22/arch-arm} sysroot, and of the toolchain binaries for a 32-bit ARM +the {@code android-21/arch-arm} sysroot, and of the toolchain binaries for a 32-bit ARM architecture.</p> <p>Note that the toolchain binaries do not depend on or contain host-specific paths, in other words, @@ -187,6 +195,14 @@ Table 3 shows the values to use for other toolchains: <th scope="col">Value</th> </tr> <tr> + <td>mips64 compiler</td> + <td>{@code --arch=mips64}</td> + </tr> + <tr> + <td>mips GCC 4.8 compiler</td> + <td>{@code --arch=mips}</td> + </tr> + <tr> <td>x86 GCC 4.8 compiler</td> <td>{@code --arch=x86}</td> </tr> @@ -195,7 +211,7 @@ Table 3 shows the values to use for other toolchains: <td>{@code --arch=x86_64}</td> </tr> <tr> - <td>MIPS GCC 4.8 compiler</td> + <td>mips GCC 4.8 compiler</td> <td>{@code --arch=mips}</td> </tr> </table> @@ -214,34 +230,28 @@ values you can specify for {@code <toolchain>}:</p> <tr> <td>arm</td> <td> - <li>{@code --toolchain=arm-linux-android-4.6}</li> - <li>{@code --toolchain=arm-linux-android-4.7}</li> - <li>{@code --toolchain=arm-linux-android-4.8}</li> - <li>{@code --toolchain=arm-linux-android-4.9}</li> - <li>{@code --toolchain=arm-linux-android-clang3.4}</li> + <li>{@code --toolchain=arm-linux-androideabi-4.8}</li> + <li>{@code --toolchain=arm-linux-androideabi-4.9}</li> <li>{@code --toolchain=arm-linux-android-clang3.5}</li> + <li>{@code --toolchain=arm-linux-android-clang3.6}</li> </td> </tr> <tr> <td>x86</td> <td> - <li>{@code --toolchain=x86-linux-android-4.6}</li> - <li>{@code --toolchain=x86-linux-android-4.7}</li> <li>{@code --toolchain=x86-linux-android-4.8}</li> <li>{@code --toolchain=x86-linux-android-4.9}</li> - <li>{@code --toolchain=x86-linux-android-clang3.4}</li> <li>{@code --toolchain=x86-linux-android-clang3.5}</li> + <li>{@code --toolchain=x86-linux-android-clang3.6}</li> </td> </tr> <tr> <td>mips</td> <td> - <li>{@code --toolchain=mips-linux-android-4.6}</li> - <li>{@code --toolchain=mips-linux-android-4.7}</li> <li>{@code --toolchain=mips-linux-android-4.8}</li> <li>{@code --toolchain=mips-linux-android-4.9}</li> - <li>{@code --toolchain=mips-linux-android-clang3.4}</li> <li>{@code --toolchain=mips-linux-android-clang3.5}</li> + <li>{@code --toolchain=mips-linux-android-clang3.6}</li> </td> </tr> @@ -249,42 +259,46 @@ values you can specify for {@code <toolchain>}:</p> <td>arm64</td> <td> <li>{@code --toolchain=aarch64-linux-android-4.9}</li> - <li>{@code --toolchain=aarch64-linux-android-clang3.4}</li> <li>{@code --toolchain=aarch64-linux-android-clang3.5}</li> + <li>{@code --toolchain=aarch64-linux-android-clang3.6}</li> </td> </tr> <tr> <td>x86_64</td> <td> <li>{@code --toolchain=x86_64-linux-android-4.9}</li> - <li>{@code --toolchain=x86_64-linux-android-clang3.4}</li> <li>{@code --toolchain=x86_64-linux-android-clang3.5}</li> + <li>{@code --toolchain=x86_64-linux-android-clang3.6}</li> </td> </tr> <tr> <td>mips64</td> <td> <li>{@code --toolchain=mips64el-linux-android-4.9}</li> - <li>{@code --toolchain=mips64el-linux-android-clang3.4}</li> <li>{@code --toolchain=mips64el-linux-android-clang3.5}</li> + <li>{@code --toolchain=mips64el-linux-android-clang3.6}</li> </td> </tr> </table> -<p class="note"<strong>Note: </strong> Table 4 is not an exhaustive list. Other combinations may +<p class="note"><strong>Note: </strong> Table 4 is not an exhaustive list. Other combinations may also be valid, but are unverified.</p> -<p>You can also copy Clang/LLVM 3.3, using one of two methods: You can append {@code -clang3.3} to +<p>You can also copy Clang/LLVM 3.6, using one of two methods: You can append {@code -clang3.6} to the {@code --toolchain} option, so that the {@code --toolchain} option looks like the following example: <pre class="no-pretty-print"> ---toolchain=arm-linux-androideabi-clang3.3 +--toolchain=arm-linux-androideabi-clang3.6 </pre> -<p>Alternatively, you can add {@code -llvm-version=3.3} as a separate option on the command +<p>You can also add {@code -llvm-version=3.6} as a separate option on the command line.</p> +<p class="note"><strong>Note: </strong>Instead of specifying a specific version, you can also +use {@code <version>}, which defaults +to the highest available version of Clang.</p> + <p>By default, the build system builds for a 32-bit host toolchain. You can specify a 64-bit host toolchain instead. Table 5 shows the value to use with {@code -system} for different platforms.</p> @@ -304,17 +318,21 @@ platforms.</p> <td>64-bit MacOSX</td> <td>{@code -system=darwin-x86_64}</td> </tr> + <tr> + <td>64-bit Windows</td> + <td>{@code -system=windows-x86_64}</td> + </tr> </table> -For more information on specifying a 32- or 64-bit instruction host toolchain, see -<a href="{@docRoot}/ndk/guides/ndk-build.html#6432">ndk-build</a>. +For more information on specifying a 64- or 32-bit instruction host toolchain, see +<a href="{@docRoot}ndk/guides/ndk-build.html#6432">64-Bit and 32-Bit Toolchains</a>. -<p>You may specify {@code stl=stlport} to copy {@code libstlport} instead of the default +<p>You may specify {@code --stl=stlport} to copy {@code libstlport} instead of the default {@code libgnustl}. If you do so, and you wish to link against the shared library, you must explicitly use {@code -lstlport_shared}. This requirement is similar to having to use {@code -lgnustl_shared} for GNU {@code libstdc++}.</p> -<p>Similarly, you can specify {@code -stl=libc++} to copy the LLVM libc++ headers and libraries. +<p>Similarly, you can specify {@code --stl=libc++} to copy the LLVM libc++ headers and libraries. To link against the shared library, you must explicitly use -lc++_shared.</p> <p>You can make these settings directly, as in the following example:</p> @@ -334,16 +352,16 @@ copy of a C++ STL library, with working exceptions and RTTI support.</p> <p>For more options and details, use {@code --help}.</p> -<h2>Working with Clang</h2> +<h2 id="wwc">Working with Clang</h2> <p>You can install Clang binaries in the standalone installation by using the {@code --llvm-version=<version>} option. {@code <version>} is a LLVM/Clang version -number, such as {@code 3.4} or {@code 3.5}. For example: +number, such as {@code 3.5} or {@code 3.6}. For example: <pre class="no-pretty-print"> build/tools/make-standalone-toolchain.sh \ --install-dir=/tmp/mydir \ ---toolchain=arm-linux-androideabi-4.7 \ ---llvm-version=3.5 +--toolchain=arm-linux-androideabi-4.8 \ +--llvm-version=3.6 </pre> <p>Note that Clang binaries are copied along with the GCC ones, because they rely on the same @@ -356,12 +374,12 @@ be able to use them in your own builds by just setting the {@code CC} and {@code variables to point to them.</p> <h4>Invoking Clang</h4> -<p>In an ARM standalone installation built with {@code llvm-version=3.3}, invoking +<p>In an ARM standalone installation built with {@code llvm-version=3.6}, invoking <a href="http://clang.llvm.org/">Clang</a> on a Unix system takes the form of a single line. For instance:</p> <pre class="no-pretty-print"> -dirname $0 /clang31 -target armv5te-none-linux-androideabi "$@" +`dirname $0`/clang36 -target armv5te-none-linux-androideabi "$@" </pre> <p><code>clang++</code> invokes <code>clang++31</code> in the same way.</p> @@ -404,7 +422,7 @@ working properly:</p> <ul> <li>{@code -v} to dump commands associated with compiler driver issues</li> <li>{@code -###} to dump command line options, including implicitly predefined ones.</li> -<li>{@code -x c /dev/null -dM -E} to dump predefined preprocessor definitions</li> +<li>{@code -x c < /dev/null -dM -E} to dump predefined preprocessor definitions</li> <li>{@code -save-temps} to compare {@code *.i} or {@code *.ii} preprocessed files.</li> </ul> @@ -413,9 +431,9 @@ working properly:</p> section.</p> -<h2>ABI Compatibility</h2> +<h2 id="abi">ABI Compatibility</h2> <p>The machine code that the ARM toolchain generates should be compatible with the official Android -<a href="{docRoot}/ndk/guides/cpu-arch-abis.html">armeabi ABI</a> by default.</p> +{@code armeabi} <a href="{@docRoot}ndk/guides/abis.html">ABI</a> by default.</p> <p>We recommend use of the {@code -mthumb} compiler flag to force the generation of 16-bit Thumb-1 instructions (the default being 32-bit ARM instructions).</p> @@ -467,9 +485,9 @@ NEON functions.</p> <p>You don't have to use any specific compiler flag when targeting the MIPS ABI.</p> -<p>To learn more about ABI support, see <a href="{@docRoot}/ndk/guides/x86.html">x86</a>.</p> +<p>To learn more about ABI support, see <a href="{@docRoot}ndk/guides/x86.html">x86</a>.</p> -<h2>Warnings and Limitations</h2> +<h2 id="war">Warnings and Limitations</h2> <h3>Windows support</h3> <p>The Windows binaries do not depend on Cygwin. This lack of dependency makes them faster. The cost, however, is that they do not understand Cygwin path specifications like @@ -516,7 +534,7 @@ arm-linux-androideabi-g++ .... -lsupc++ <h3>C++ STL support</h3> <p>The standalone toolchain includes a copy of a C++ Standard Template Library implementation. This implementation is either for GNU libstdc++, STLport, or libc++, depending on what you specify for the -{@code -stl=<name>} option described previously. To use this implementation of STL, you need +{@code --stl=<name>} option described previously. To use this implementation of STL, you need to link your project with the proper library:</p> <ul> @@ -551,17 +569,29 @@ for your code to load properly. Table 6 shows where this file is for each toolch <th scope="col">Location</th> </tr> <tr> - <td>ARM</td> + <td>arm</td> <td>{@code $TOOLCHAIN/arm-linux-androideabi/lib/}</td> </tr> <tr> + <td>arm64</td> + <td>{@code $TOOLCHAIN/aarch64-linux-android/lib/}</td> + </tr> + <tr> <td>x86</td> <td>{@code $TOOLCHAIN/i686-linux-android/lib/}</td> </tr> <tr> - <td>MIPS</td> + <td>x86_64</td> + <td>{@code $TOOLCHAIN/x86_64-linux-android/lib/}</td> + </tr> + <tr> + <td>mips</td> <td>{@code $TOOLCHAIN/mipsel-linux-android/lib/}</td> </tr> + <tr> + <td>mips64</td> + <td>{@code $TOOLCHAIN/mips64el-linux-android/lib/}</td> + </tr> </table> <p class="note"><strong>Note: </strong>If your project contains multiple shared libraries or diff --git a/docs/html-ndk/ndk/guides/x86-64.jd b/docs/html-ndk/ndk/guides/x86-64.jd index 22f3aaa..c2f0d28 100644 --- a/docs/html-ndk/ndk/guides/x86-64.jd +++ b/docs/html-ndk/ndk/guides/x86-64.jd @@ -41,7 +41,7 @@ libraries that run on the CPU powering his or her device.</p> <h2 id="st">Standalone Toolchain</h2> -<p>It is possible to use the 64-bit x86 toolchain in standalone mode with the NDK. For more +<p>You can use the 64-bit x86 toolchain in standalone mode with the NDK. For more information about doing so, see <a href="{@docRoot}ndk/guides/standalone_toolchain.html"> Standalone Toolchain</a>, under the "Advanced method" section. @@ -49,4 +49,4 @@ Standalone Toolchain</a>, under the "Advanced method" section. <p>The NDK provides native versions of Android APIs for 64-bit x86 machine code starting from Android 5.0 (Android API level 21). If your project files target an older API level, but include {@code x86_64} as a targeted platform, the NDK build script automatically selects the right set of -native platform headers and libraries for you.</p>
\ No newline at end of file +native platform headers and libraries for you.</p> diff --git a/docs/html-ndk/ndk/guides/x86.jd b/docs/html-ndk/ndk/guides/x86.jd index e112a56..3a01b05 100644 --- a/docs/html-ndk/ndk/guides/x86.jd +++ b/docs/html-ndk/ndk/guides/x86.jd @@ -28,7 +28,7 @@ APP_ABI := armeabi armeabi-v7a x86 </pre <p>For more information about defining the {@code APP_ABI} variable, see -<a href="{docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a>.</p> +<a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a>.</p> <p>The build system places generated libraries into {@code $PROJECT/libs/x86/}, where {@code $PROJECT} represents your project's root directory, and embeds them in your APK under diff --git a/docs/html-ndk/ndk/index.jd b/docs/html-ndk/ndk/index.jd index 8d8f14d..a88c15d 100644 --- a/docs/html-ndk/ndk/index.jd +++ b/docs/html-ndk/ndk/index.jd @@ -1,5 +1,5 @@ page.title=Android NDK -page.tags="ndk, native, c, c++", +page.tags="ndk, native, c, c++", meta.tags="ndk, native, c++" fullpage=true section.landing=true @@ -13,7 +13,7 @@ footer.hide=1 <div class="col-7of16 cdol-push-1of16"> <h1 class="dac-hero-title">Android NDK</h1> <p class="dac-hero-description"> - The Android NDK is a toolset that lets you implement parts of your app using native code languages such as C and C++. For certain types of apps, this can help you reuse existing code libraries written in those languages. + The Android NDK is a toolset that lets you implement parts of your app using native-code languages such as C and C++. For certain types of apps, this can help you reuse existing code libraries written in those languages. </p> <a class="dac-hero-cta" href="/ndk/guides/index.html"> @@ -48,22 +48,3 @@ footer.hide=1 data-maxResults="9" data-initial-results="3"></div> </div></section> - -<section class="dac-section dac-light"><div class="wrap"> - <h1 class="dac-section-title">Something else</h1> - <div class="dac-section-subtitle"> - Placeholder - </div> - - <ul class="dac-section-links"> - <li class="dac-section-link"><a href=""> - <span class="dac-sprite dac-auto-chevron"></span> - Overview and Usage - </a></li> - <li class="dac-section-link"><a href="/google/play/filters.html"> - <span class="dac-sprite dac-auto-chevron"></span> - User Guide - </a></li> - - </ul> -</div></section> diff --git a/docs/html-ndk/ndk/reference/annotated.jd b/docs/html-ndk/ndk/reference/annotated.jd index 7a0e09a..8045f8d 100644 --- a/docs/html-ndk/ndk/reference/annotated.jd +++ b/docs/html-ndk/ndk/reference/annotated.jd @@ -23,11 +23,3 @@ page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css" </table> </div><!-- directory --> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/asset__manager_8h.jd b/docs/html-ndk/ndk/reference/asset__manager_8h.jd index 140af54..88d8dea 100644 --- a/docs/html-ndk/ndk/reference/asset__manager_8h.jd +++ b/docs/html-ndk/ndk/reference/asset__manager_8h.jd @@ -73,11 +73,3 @@ Functions</h2></td></tr> <tr class="separator:ga20344cb952a77fa1004f592fb1b55124"><td class="memSeparator" colspan="2"> </td></tr> </table> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/asset__manager__jni_8h.jd b/docs/html-ndk/ndk/reference/asset__manager__jni_8h.jd index 20fb48d..8aace05 100644 --- a/docs/html-ndk/ndk/reference/asset__manager__jni_8h.jd +++ b/docs/html-ndk/ndk/reference/asset__manager__jni_8h.jd @@ -23,11 +23,3 @@ Functions</h2></td></tr> <tr class="separator:gadfd6537af41577735bcaee52120127f4"><td class="memSeparator" colspan="2"> </td></tr> </table> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/bitmap_8h.jd b/docs/html-ndk/ndk/reference/bitmap_8h.jd index b2f999e..518cab1 100644 --- a/docs/html-ndk/ndk/reference/bitmap_8h.jd +++ b/docs/html-ndk/ndk/reference/bitmap_8h.jd @@ -59,11 +59,3 @@ Functions</h2></td></tr> <tr class="separator:ga4aca91f37baddd42d0051dca8179d4ed"><td class="memSeparator" colspan="2"> </td></tr> </table> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/classes.jd b/docs/html-ndk/ndk/reference/classes.jd index 3e97e5e..e0ec721 100644 --- a/docs/html-ndk/ndk/reference/classes.jd +++ b/docs/html-ndk/ndk/reference/classes.jd @@ -18,11 +18,3 @@ page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css" </table> <div class="qindex"><a class="qindex" href="#letter_A">A</a></div> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/configuration_8h.jd b/docs/html-ndk/ndk/reference/configuration_8h.jd index 3edcb8a..3f5f07c 100644 --- a/docs/html-ndk/ndk/reference/configuration_8h.jd +++ b/docs/html-ndk/ndk/reference/configuration_8h.jd @@ -220,11 +220,3 @@ Functions</h2></td></tr> <tr class="separator:gafd2bb31057c8d57efcea7603458d2a8d"><td class="memSeparator" colspan="2"> </td></tr> </table> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/deprecated.jd b/docs/html-ndk/ndk/reference/deprecated.jd index 420c93b..0e69db6 100644 --- a/docs/html-ndk/ndk/reference/deprecated.jd +++ b/docs/html-ndk/ndk/reference/deprecated.jd @@ -21,11 +21,3 @@ page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css" <dd>This flag has no effect. </dd> </dl> </div></div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/dir_035c76f7235f5f563d38e3ab90cb9716.jd b/docs/html-ndk/ndk/reference/dir_035c76f7235f5f563d38e3ab90cb9716.jd index 6126149..025427a 100644 --- a/docs/html-ndk/ndk/reference/dir_035c76f7235f5f563d38e3ab90cb9716.jd +++ b/docs/html-ndk/ndk/reference/dir_035c76f7235f5f563d38e3ab90cb9716.jd @@ -47,11 +47,3 @@ Files</h2></td></tr> <tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr> </table> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/dir_d44c64559bbebec7f509842c48db8b23.jd b/docs/html-ndk/ndk/reference/dir_d44c64559bbebec7f509842c48db8b23.jd index 26ed8f4..e42811e 100644 --- a/docs/html-ndk/ndk/reference/dir_d44c64559bbebec7f509842c48db8b23.jd +++ b/docs/html-ndk/ndk/reference/dir_d44c64559bbebec7f509842c48db8b23.jd @@ -19,11 +19,3 @@ Directories</h2></td></tr> <tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr> </table> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/files.jd b/docs/html-ndk/ndk/reference/files.jd index 236e96a..1144d5b 100644 --- a/docs/html-ndk/ndk/reference/files.jd +++ b/docs/html-ndk/ndk/reference/files.jd @@ -28,11 +28,3 @@ page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css" </table> </div><!-- directory --> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/functions.jd b/docs/html-ndk/ndk/reference/functions.jd index 4a86039..fade0d5 100644 --- a/docs/html-ndk/ndk/reference/functions.jd +++ b/docs/html-ndk/ndk/reference/functions.jd @@ -325,11 +325,3 @@ page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css" </li> </ul> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/functions_vars.jd b/docs/html-ndk/ndk/reference/functions_vars.jd index c2c53d6..129c7ec 100644 --- a/docs/html-ndk/ndk/reference/functions_vars.jd +++ b/docs/html-ndk/ndk/reference/functions_vars.jd @@ -325,11 +325,3 @@ page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css" </li> </ul> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/globals.jd b/docs/html-ndk/ndk/reference/globals.jd index 6cbbe54..cb6dc11 100644 --- a/docs/html-ndk/ndk/reference/globals.jd +++ b/docs/html-ndk/ndk/reference/globals.jd @@ -2292,11 +2292,3 @@ page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css" </li> </ul> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/globals_defs.jd b/docs/html-ndk/ndk/reference/globals_defs.jd index 64ef6c6..8d04efb 100644 --- a/docs/html-ndk/ndk/reference/globals_defs.jd +++ b/docs/html-ndk/ndk/reference/globals_defs.jd @@ -22,11 +22,3 @@ page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css" </li> </ul> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/globals_enum.jd b/docs/html-ndk/ndk/reference/globals_enum.jd index 7d885ea..7fd396e 100644 --- a/docs/html-ndk/ndk/reference/globals_enum.jd +++ b/docs/html-ndk/ndk/reference/globals_enum.jd @@ -10,11 +10,3 @@ page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css" </li> </ul> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/globals_eval.jd b/docs/html-ndk/ndk/reference/globals_eval.jd index 8296358..e1399c7 100644 --- a/docs/html-ndk/ndk/reference/globals_eval.jd +++ b/docs/html-ndk/ndk/reference/globals_eval.jd @@ -1650,11 +1650,3 @@ page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css" </li> </ul> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/globals_eval_w.jd b/docs/html-ndk/ndk/reference/globals_eval_w.jd index ab9cfe9..c996d30 100644 --- a/docs/html-ndk/ndk/reference/globals_eval_w.jd +++ b/docs/html-ndk/ndk/reference/globals_eval_w.jd @@ -18,11 +18,3 @@ page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css" </li> </ul> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/globals_func.jd b/docs/html-ndk/ndk/reference/globals_func.jd index b6073e6..ae48353 100644 --- a/docs/html-ndk/ndk/reference/globals_func.jd +++ b/docs/html-ndk/ndk/reference/globals_func.jd @@ -549,11 +549,3 @@ page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css" </li> </ul> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/globals_type.jd b/docs/html-ndk/ndk/reference/globals_type.jd index 2659971..99fa859 100644 --- a/docs/html-ndk/ndk/reference/globals_type.jd +++ b/docs/html-ndk/ndk/reference/globals_type.jd @@ -88,11 +88,3 @@ page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css" </li> </ul> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/globals_vars.jd b/docs/html-ndk/ndk/reference/globals_vars.jd index f538a6f..e6bd2a4 100644 --- a/docs/html-ndk/ndk/reference/globals_vars.jd +++ b/docs/html-ndk/ndk/reference/globals_vars.jd @@ -10,11 +10,3 @@ page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css" </li> </ul> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/globals_w.jd b/docs/html-ndk/ndk/reference/globals_w.jd index 0bb34db..b72e8c2 100644 --- a/docs/html-ndk/ndk/reference/globals_w.jd +++ b/docs/html-ndk/ndk/reference/globals_w.jd @@ -18,11 +18,3 @@ page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css" </li> </ul> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/group___asset.jd b/docs/html-ndk/ndk/reference/group___asset.jd index 300bc87..c2f9067 100644 --- a/docs/html-ndk/ndk/reference/group___asset.jd +++ b/docs/html-ndk/ndk/reference/group___asset.jd @@ -589,11 +589,3 @@ Functions</h2></td></tr> </div> </div> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/group___bitmap.jd b/docs/html-ndk/ndk/reference/group___bitmap.jd index 045b550..2f2b199 100644 --- a/docs/html-ndk/ndk/reference/group___bitmap.jd +++ b/docs/html-ndk/ndk/reference/group___bitmap.jd @@ -228,11 +228,3 @@ Functions</h2></td></tr> </div> </div> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/group___configuration.jd b/docs/html-ndk/ndk/reference/group___configuration.jd index 93d0fab..708722e 100644 --- a/docs/html-ndk/ndk/reference/group___configuration.jd +++ b/docs/html-ndk/ndk/reference/group___configuration.jd @@ -1555,11 +1555,3 @@ Functions</h2></td></tr> </div> </div> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/group___input.jd b/docs/html-ndk/ndk/reference/group___input.jd index 42ff102..55db956 100644 --- a/docs/html-ndk/ndk/reference/group___input.jd +++ b/docs/html-ndk/ndk/reference/group___input.jd @@ -3680,11 +3680,3 @@ Functions</h2></td></tr> </div> </div> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/group___looper.jd b/docs/html-ndk/ndk/reference/group___looper.jd index 9720baf..bc845f8 100644 --- a/docs/html-ndk/ndk/reference/group___looper.jd +++ b/docs/html-ndk/ndk/reference/group___looper.jd @@ -440,11 +440,3 @@ Functions</h2></td></tr> </div> </div> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/group___native_activity.jd b/docs/html-ndk/ndk/reference/group___native_activity.jd index aa8c96c..d0b2178 100644 --- a/docs/html-ndk/ndk/reference/group___native_activity.jd +++ b/docs/html-ndk/ndk/reference/group___native_activity.jd @@ -729,11 +729,3 @@ Variables</h2></td></tr> </div> </div> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/group___sensor.jd b/docs/html-ndk/ndk/reference/group___sensor.jd index 1ce4f03..41a0aec 100644 --- a/docs/html-ndk/ndk/reference/group___sensor.jd +++ b/docs/html-ndk/ndk/reference/group___sensor.jd @@ -923,11 +923,3 @@ Functions</h2></td></tr> </div> </div> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/group___storage.jd b/docs/html-ndk/ndk/reference/group___storage.jd index 674bc48..e29303a 100644 --- a/docs/html-ndk/ndk/reference/group___storage.jd +++ b/docs/html-ndk/ndk/reference/group___storage.jd @@ -448,11 +448,3 @@ Functions</h2></td></tr> </div> </div> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/index.jd b/docs/html-ndk/ndk/reference/index.jd index a496f19..94bcb7a 100644 --- a/docs/html-ndk/ndk/reference/index.jd +++ b/docs/html-ndk/ndk/reference/index.jd @@ -1,4 +1,17 @@ -page.title=Reference +page.title=API Reference @jd:body -<p>NDK reference docs
\ No newline at end of file +<p>The API reference for the NDK includes documentation for the base set of +native headers that the NDK provides for Android. These headers, and their associated libraries, +expose a variety of features otherwise only accessible via the Android framework. +A few of these features are as follows:</p> + +<ul> + <li>Using hardware sensors.</li> + <li>Accessing storage.</li> + <li>Handling user input.</li> + <li>Setting configuration information, such as screen orientation.</li> +</ul> + +<p>The API reference provides detailed information on these and other functionalities provided +in the NDK.</p> diff --git a/docs/html-ndk/ndk/reference/input_8h.jd b/docs/html-ndk/ndk/reference/input_8h.jd index b614f91..855a346 100644 --- a/docs/html-ndk/ndk/reference/input_8h.jd +++ b/docs/html-ndk/ndk/reference/input_8h.jd @@ -372,11 +372,3 @@ Functions</h2></td></tr> <tr class="separator:ga17e87e0f35d47d729eac31a0dfb1ac33"><td class="memSeparator" colspan="2"> </td></tr> </table> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/keycodes_8h.jd b/docs/html-ndk/ndk/reference/keycodes_8h.jd index b739820..338a361 100644 --- a/docs/html-ndk/ndk/reference/keycodes_8h.jd +++ b/docs/html-ndk/ndk/reference/keycodes_8h.jd @@ -348,11 +348,3 @@ Enumerations</h2></td></tr> <tr class="separator:ga6b7b47dd702d9e331586d485013fd1ea"><td class="memSeparator" colspan="2"> </td></tr> </table> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/looper_8h.jd b/docs/html-ndk/ndk/reference/looper_8h.jd index cb4dbdd..9171631 100644 --- a/docs/html-ndk/ndk/reference/looper_8h.jd +++ b/docs/html-ndk/ndk/reference/looper_8h.jd @@ -68,11 +68,3 @@ Functions</h2></td></tr> <tr class="separator:gaf7d68ed05698b251489b4f6c8e54daad"><td class="memSeparator" colspan="2"> </td></tr> </table> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/modules.jd b/docs/html-ndk/ndk/reference/modules.jd index cebd7af..2da7307 100644 --- a/docs/html-ndk/ndk/reference/modules.jd +++ b/docs/html-ndk/ndk/reference/modules.jd @@ -21,11 +21,3 @@ page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css" </table> </div><!-- directory --> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/native__activity_8h.jd b/docs/html-ndk/ndk/reference/native__activity_8h.jd index b88d821..147ffdb 100644 --- a/docs/html-ndk/ndk/reference/native__activity_8h.jd +++ b/docs/html-ndk/ndk/reference/native__activity_8h.jd @@ -72,11 +72,3 @@ Variables</h2></td></tr> <tr class="separator:ga02791d0d490839055169f39fdc905c5e"><td class="memSeparator" colspan="2"> </td></tr> </table> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/native__window_8h.jd b/docs/html-ndk/ndk/reference/native__window_8h.jd index a194a23..75f9469 100644 --- a/docs/html-ndk/ndk/reference/native__window_8h.jd +++ b/docs/html-ndk/ndk/reference/native__window_8h.jd @@ -59,11 +59,3 @@ Functions</h2></td></tr> <tr class="separator:ga4dc9b687ead9034fbc11bf2d90f203f9"><td class="memSeparator" colspan="2"> </td></tr> </table> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/native__window__jni_8h.jd b/docs/html-ndk/ndk/reference/native__window__jni_8h.jd index e937fdf..bffbc03 100644 --- a/docs/html-ndk/ndk/reference/native__window__jni_8h.jd +++ b/docs/html-ndk/ndk/reference/native__window__jni_8h.jd @@ -23,11 +23,3 @@ Functions</h2></td></tr> <tr class="separator:ga774d0a87ec496b3940fcddccbc31fd9d"><td class="memSeparator" colspan="2"> </td></tr> </table> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/obb_8h.jd b/docs/html-ndk/ndk/reference/obb_8h.jd index 53ed28e..a856d4ee 100644 --- a/docs/html-ndk/ndk/reference/obb_8h.jd +++ b/docs/html-ndk/ndk/reference/obb_8h.jd @@ -43,11 +43,3 @@ Functions</h2></td></tr> <tr class="separator:ga68d916570c756da9fd0d9096358300eb"><td class="memSeparator" colspan="2"> </td></tr> </table> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/pages.jd b/docs/html-ndk/ndk/reference/pages.jd index 16fc5b0..2d7ece8 100644 --- a/docs/html-ndk/ndk/reference/pages.jd +++ b/docs/html-ndk/ndk/reference/pages.jd @@ -14,11 +14,3 @@ page.customHeadTag=<link rel="stylesheet" type="text/css" href="doxygen-dac.css" </table> </div><!-- directory --> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/rect_8h.jd b/docs/html-ndk/ndk/reference/rect_8h.jd index d115ea9..85787b5 100644 --- a/docs/html-ndk/ndk/reference/rect_8h.jd +++ b/docs/html-ndk/ndk/reference/rect_8h.jd @@ -28,11 +28,3 @@ Typedefs</h2></td></tr> <tr class="separator:gaa984a498f0e146ac57c6022a323423cf"><td class="memSeparator" colspan="2"> </td></tr> </table> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/reference_toc.cs b/docs/html-ndk/ndk/reference/reference_toc.cs index 404a0a6..8ddb864 100644 --- a/docs/html-ndk/ndk/reference/reference_toc.cs +++ b/docs/html-ndk/ndk/reference/reference_toc.cs @@ -15,21 +15,21 @@ </ul> </li> <li class="nav-section"> - <div class="nav-section-header empty"><a href="/ndk/reference/group___bitmap.html"><span class="en"> + <div class="nav-section-header"><a href="/ndk/reference/group___bitmap.html"><span class="en"> Bitmap</span></a></div> <ul> <li><a href="/ndk/reference/bitmap_8h.html">bitmap.h</a></li> </ul> </li> <li class="nav-section"> - <div class="nav-section-header empty"><a href="/ndk/reference/group___configuration.html"><span class="en"> + <div class="nav-section-header"><a href="/ndk/reference/group___configuration.html"><span class="en"> Configuration</span></a></div> <ul> <li><a href="/ndk/reference/configuration_8h.html">configuration.h</a></li> </ul> </li> <li class="nav-section"> - <div class="nav-section-header empty"><a href="/ndk/reference/group___input.html"><span class="en"> + <div class="nav-section-header"><a href="/ndk/reference/group___input.html"><span class="en"> Input</span></a></div> <ul> <li><a href="/ndk/reference/input_8h.html">input.h</a></li> @@ -37,14 +37,14 @@ </ul> </li> <li class="nav-section"> - <div class="nav-section-header empty"><a href="/ndk/reference/group___looper.html"><span class="en"> + <div class="nav-section-header"><a href="/ndk/reference/group___looper.html"><span class="en"> Looper</span></a></div> <ul> <li><a href="/ndk/reference/looper_8h.html">looper.h</a></li> </ul> </li> <li class="nav-section"> - <div class="nav-section-header empty"><a href="/ndk/reference/group___native_activity.html"><span class="en"> + <div class="nav-section-header"><a href="/ndk/reference/group___native_activity.html"><span class="en"> Native Activity and Window</span></a></div> <ul> <li><a href="/ndk/reference/native__activity_8h.html">native_activity.h</a></li> @@ -54,20 +54,20 @@ </ul> </li> <li class="nav-section"> - <div class="nav-section-header empty"><a href="/ndk/reference/group___sensor.html"><span class="en"> + <div class="nav-section-header"><a href="/ndk/reference/group___sensor.html"><span class="en"> Sensor</span></a></div> <ul> <li><a href="/ndk/reference/sensor_8h.html">sensor.h</a></li> </ul> </li> <li class="nav-section"> - <div class="nav-section-header empty"><a href="/ndk/reference/group___storage.html"><span class="en"> + <div class="nav-section-header"><a href="/ndk/reference/group___storage.html"><span class="en"> Storage Manager</span></a></div> - </li> <ul> <li><a href="/ndk/reference/storage__manager_8h.html">sensor_manager.h</a></li> <li><a href="/ndk/reference/obb_8h.html">obb.h</a></li> </ul> + </li> </ul> <script type="text/javascript"> diff --git a/docs/html-ndk/ndk/reference/sensor_8h.jd b/docs/html-ndk/ndk/reference/sensor_8h.jd index d762797..a537f4f 100644 --- a/docs/html-ndk/ndk/reference/sensor_8h.jd +++ b/docs/html-ndk/ndk/reference/sensor_8h.jd @@ -141,11 +141,3 @@ Functions</h2></td></tr> <tr class="separator:ga0ff4118e400bedac62be6b79e9e0f924"><td class="memSeparator" colspan="2"> </td></tr> </table> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/storage__manager_8h.jd b/docs/html-ndk/ndk/reference/storage__manager_8h.jd index 00d04e8..6048d84 100644 --- a/docs/html-ndk/ndk/reference/storage__manager_8h.jd +++ b/docs/html-ndk/ndk/reference/storage__manager_8h.jd @@ -57,11 +57,3 @@ Functions</h2></td></tr> <tr class="separator:gad5c90305d627e0c768da37cb3e9f08c4"><td class="memSeparator" colspan="2"> </td></tr> </table> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/struct_a_heart_rate_event.jd b/docs/html-ndk/ndk/reference/struct_a_heart_rate_event.jd index d15c06b..1cd2a2d 100644 --- a/docs/html-ndk/ndk/reference/struct_a_heart_rate_event.jd +++ b/docs/html-ndk/ndk/reference/struct_a_heart_rate_event.jd @@ -49,11 +49,3 @@ Data Fields</h2></td></tr> <li><a class="el" href="sensor_8h.html">sensor.h</a></li> </ul> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/struct_a_meta_data_event.jd b/docs/html-ndk/ndk/reference/struct_a_meta_data_event.jd index 1c0ca05..352b5ba 100644 --- a/docs/html-ndk/ndk/reference/struct_a_meta_data_event.jd +++ b/docs/html-ndk/ndk/reference/struct_a_meta_data_event.jd @@ -49,11 +49,3 @@ Data Fields</h2></td></tr> <li><a class="el" href="sensor_8h.html">sensor.h</a></li> </ul> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/struct_a_native_activity.jd b/docs/html-ndk/ndk/reference/struct_a_native_activity.jd index ee4fdca..6d8124b 100644 --- a/docs/html-ndk/ndk/reference/struct_a_native_activity.jd +++ b/docs/html-ndk/ndk/reference/struct_a_native_activity.jd @@ -175,11 +175,3 @@ Data Fields</h2></td></tr> <li><a class="el" href="native__activity_8h.html">native_activity.h</a></li> </ul> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/struct_a_native_activity_callbacks.jd b/docs/html-ndk/ndk/reference/struct_a_native_activity_callbacks.jd index dce9d95..45b8e5e 100644 --- a/docs/html-ndk/ndk/reference/struct_a_native_activity_callbacks.jd +++ b/docs/html-ndk/ndk/reference/struct_a_native_activity_callbacks.jd @@ -263,11 +263,3 @@ Data Fields</h2></td></tr> <li><a class="el" href="native__activity_8h.html">native_activity.h</a></li> </ul> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/struct_a_native_window___buffer.jd b/docs/html-ndk/ndk/reference/struct_a_native_window___buffer.jd index f5a8650..a2008fd 100644 --- a/docs/html-ndk/ndk/reference/struct_a_native_window___buffer.jd +++ b/docs/html-ndk/ndk/reference/struct_a_native_window___buffer.jd @@ -108,11 +108,3 @@ Data Fields</h2></td></tr> <li><a class="el" href="native__window_8h.html">native_window.h</a></li> </ul> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/struct_a_rect.jd b/docs/html-ndk/ndk/reference/struct_a_rect.jd index 96a597f..4b9bb67 100644 --- a/docs/html-ndk/ndk/reference/struct_a_rect.jd +++ b/docs/html-ndk/ndk/reference/struct_a_rect.jd @@ -84,11 +84,3 @@ Data Fields</h2></td></tr> <li><a class="el" href="rect_8h.html">rect.h</a></li> </ul> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/struct_a_sensor_event.jd b/docs/html-ndk/ndk/reference/struct_a_sensor_event.jd index 9e71233..3c6e49d 100644 --- a/docs/html-ndk/ndk/reference/struct_a_sensor_event.jd +++ b/docs/html-ndk/ndk/reference/struct_a_sensor_event.jd @@ -362,11 +362,3 @@ Data Fields</h2></td></tr> <li><a class="el" href="sensor_8h.html">sensor.h</a></li> </ul> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/struct_a_sensor_vector.jd b/docs/html-ndk/ndk/reference/struct_a_sensor_vector.jd index 39c76ab..397ad6d 100644 --- a/docs/html-ndk/ndk/reference/struct_a_sensor_vector.jd +++ b/docs/html-ndk/ndk/reference/struct_a_sensor_vector.jd @@ -170,11 +170,3 @@ Data Fields</h2></td></tr> <li><a class="el" href="sensor_8h.html">sensor.h</a></li> </ul> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/struct_a_uncalibrated_event.jd b/docs/html-ndk/ndk/reference/struct_a_uncalibrated_event.jd index b4e11da..985b0b9 100644 --- a/docs/html-ndk/ndk/reference/struct_a_uncalibrated_event.jd +++ b/docs/html-ndk/ndk/reference/struct_a_uncalibrated_event.jd @@ -169,11 +169,3 @@ Data Fields</h2></td></tr> <li><a class="el" href="sensor_8h.html">sensor.h</a></li> </ul> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/struct_android_bitmap_info.jd b/docs/html-ndk/ndk/reference/struct_android_bitmap_info.jd index 1399838..f995b56 100644 --- a/docs/html-ndk/ndk/reference/struct_android_bitmap_info.jd +++ b/docs/html-ndk/ndk/reference/struct_android_bitmap_info.jd @@ -98,11 +98,3 @@ Data Fields</h2></td></tr> <li><a class="el" href="bitmap_8h.html">bitmap.h</a></li> </ul> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/reference/window_8h.jd b/docs/html-ndk/ndk/reference/window_8h.jd index 42e98d9..39e01dc 100644 --- a/docs/html-ndk/ndk/reference/window_8h.jd +++ b/docs/html-ndk/ndk/reference/window_8h.jd @@ -51,11 +51,3 @@ Enumerations</h2></td></tr> <tr class="separator:gaf715e26dfffd1f8de1c18449e2770cff"><td class="memSeparator" colspan="2"> </td></tr> </table> </div><!-- contents --> -<!-- start footer part --> -<hr class="footer"/><address class="footer"><small> -Generated on Thu May 21 2015 01:26:49 for NDK API by  <a href="http://www.doxygen.org/index.html"> -<img class="footer" src="doxygen.png" alt="doxygen"/> -</a> 1.8.6 -</small></address> -</body> -</html> diff --git a/docs/html-ndk/ndk/samples/index.jd b/docs/html-ndk/ndk/samples/index.jd index b333aa7..6b2cd16 100644 --- a/docs/html-ndk/ndk/samples/index.jd +++ b/docs/html-ndk/ndk/samples/index.jd @@ -1,4 +1,26 @@ -page.title=Samples +page.title=Samples: Overview @jd:body -<p>NDK samples
\ No newline at end of file +<p>Welcome to the NDK samples area. Here, you can download a variety of sample +apps to help deepen your understanding the NDK. + + +<p>From this page, you can download samples that provide a look at the NDK in action. A few of the +topics covered are:</p> + +<ul> + <li>Managing your native app's activity lifecycle.</li> + <li>Using native OpenGL on an Android device.</li> + <li>Implementing native audio.</li> + <li>Exporting modules.</li> +</ul> + +<p class="note"><strong>Note: </strong>These samples are also contained in the NDK installation +package; if you have already downloaded the NDK, you have them. They reside in +{@code $NDK/samples/}, where {@code $NDK} is the NDK installation root.</p> + + <div id="sdk-terms-form"> + <p><a href="{@docRoot}shareables/ndk/ndk-samples.zip" class="button"> + Download ndk-samples.zip</a></p> + </div> + diff --git a/docs/html-ndk/ndk/guides/sample_hellojni.jd b/docs/html-ndk/ndk/samples/sample_hellojni.jd index fa3fb5d..fa61b28 100644 --- a/docs/html-ndk/ndk/guides/sample_hellojni.jd +++ b/docs/html-ndk/ndk/samples/sample_hellojni.jd @@ -16,9 +16,9 @@ page.title=Sample: hello-jni </div> </div> -<p>This sample provides a bare-bones look at HelloJNI, a minimal +<p>This sample guides you through HelloJNI, a minimal application built with the NDK. This sample is in the {@code samples/hello-jni/} directory -under the root directory of your NDK installation.</p> +under the root directory of your NDK installation.</p> <h2 id="an">Android.mk</h2> @@ -120,4 +120,4 @@ that is, the string that the function on the Java side had requested.</p> <pre class="no-pretty-print"> return (*env)->NewStringUTF(env, "Hello from JNI ! Compiled with ABI " ABI "."); -</pre>
\ No newline at end of file +</pre> diff --git a/docs/html-ndk/ndk/guides/sample_na.jd b/docs/html-ndk/ndk/samples/sample_na.jd index 55362cd..a706be5 100644 --- a/docs/html-ndk/ndk/guides/sample_na.jd +++ b/docs/html-ndk/ndk/samples/sample_na.jd @@ -20,10 +20,10 @@ page.title=Sample: native-activity {@code samples/native-activity}. It is a very simple example of a purely native application, with no Java source code. In the absence of any Java source, the Java compiler still creates an executable stub for the virtual machine to run. -The stub serves as a wrapper for the actual, native program, which lives in the {@code .so} +The stub serves as a wrapper for the actual, native program, which is located in the {@code .so} file.</p> -<p>The app itself simply renders a color onto the entire screen, and +<p>The app itself simply renders a color onto the entire screen, and then changes the color partly in response to movement that it detects.</p> <h2 id="am">AndroidManifest.xml</h2> @@ -256,4 +256,4 @@ program calls OpenGL to draw the screen.</p> engine_draw_frame(&engine); } } -</pre>
\ No newline at end of file +</pre> diff --git a/docs/html-ndk/ndk/guides/sample_teapot.jd b/docs/html-ndk/ndk/samples/sample_teapot.jd index 9542a9d..97708a7 100644 --- a/docs/html-ndk/ndk/guides/sample_teapot.jd +++ b/docs/html-ndk/ndk/samples/sample_teapot.jd @@ -20,7 +20,7 @@ page.title=Sample: Teapot installation's root directory. This sample uses the OpenGL library to render the iconic <a href="http://math.hws.edu/bridgeman/courses/324/s06/doc/opengl.html#basic">Utah teapot</a>. In particular, it showcases the {@code ndk_helper} helper class, -a collection of native helper functions required for implementing games and +a collection of native helper functions required for implementing games and similar applications as native applications. This class provides:</p> <ul> @@ -77,7 +77,7 @@ APP_STL := stlport_static {@code samples/Teapot/src/com/sample/teapot}, under the NDK installation root directory. It handles activity lifecycle events, and also enables the app to display text on the screen. The following block of code is most important from the perspective of the native-side implementation: The native -code calls it to display a popup window for text display.</p> +code calls it to display a popup window for displaying text.</p> <pre class="no-pretty-print"> @@ -357,4 +357,4 @@ activity is not yet ready.</p> state->userData = &g_engine; state->onAppCmd = Engine::HandleCmd; state->onInputEvent = Engine::HandleInput; -</pre>
\ No newline at end of file +</pre> diff --git a/docs/html-ndk/ndk/samples/samples_toc.cs b/docs/html-ndk/ndk/samples/samples_toc.cs index 9a39f04..92266b1 100644 --- a/docs/html-ndk/ndk/samples/samples_toc.cs +++ b/docs/html-ndk/ndk/samples/samples_toc.cs @@ -6,13 +6,23 @@ localized titles are added in the language order specified below. ?> - <ul id="nav"> - <li class="nav-section"> - <div class="nav-section-header empty"><a href="/ndk/samples/index.html"><span class="en"> - Samples</span></a></div> - </li> + <li class="nav-section"> + <div class="nav-section-header empty"><a href="<?cs var:toroot ?>ndk/samples/index.html"> + <span class="en">Overview</span></a></div> + </li> + + <li class="nav-section"> + <div class="nav-section-header"> + <a href="<?cs var:toroot ?>ndk/samples/walkthroughs.html"> + <span class="en">Walkthroughs</span></a></div> + <ul> + <li><a href="<?cs var:toroot ?>ndk/samples/sample_hellojni.html">hello-jni</a></li> + <li><a href="<?cs var:toroot ?>ndk/samples/sample_na.html">native-activity</a></li> + <li><a href="<?cs var:toroot ?>ndk/samples/sample_teapot.html">Teapot</a></li> + </ul> + </li> </ul> diff --git a/docs/html-ndk/ndk/samples/walkthroughs.jd b/docs/html-ndk/ndk/samples/walkthroughs.jd new file mode 100644 index 0000000..88ceb56 --- /dev/null +++ b/docs/html-ndk/ndk/samples/walkthroughs.jd @@ -0,0 +1,13 @@ +page.title=Samples: Walkthroughs +@jd:body + +<p>This section provides detailed walkthroughs of several key samples. The samples are as +follows:</p> + +<li><a href="{@docRoot}ndk/samples/sample_hellojni.html">hello-jni</a>: A very basic app that +illustrates core workings of the NDK.</li> +<li><a href="{@docRoot}ndk/samples/sample_na.html">native-activity</a>: An app that shows the +fundamentals of constructing a purely native app. It places particular emphasis on the +{@code android_native_app_glue library}.</li> +<li><a href="<a href="{@docRoot}ndk/samples/sample_teapot.html">Teapot</a>: A simple OpenGL demo, +showcasing the <code>ndk_helper</code> class.</li> diff --git a/docs/html/distribute/googleplay/work/about.jd b/docs/html/distribute/googleplay/work/about.jd index bd0f72b..20fec7a 100644 --- a/docs/html/distribute/googleplay/work/about.jd +++ b/docs/html/distribute/googleplay/work/about.jd @@ -55,7 +55,7 @@ page.image=images/distribute/gpfw.jpg <li>Follow best practices for security and manage user data properly. Businesses are more conscious of data security and employee productivity, especially when it comes to features that share information with other services.</li> - <li>Support the <a href="{@docRoot}training/enterprise/app-restrictions.html">App Configuration framework to let an administrator remotely configure app settings such as: + <li>Support the <a href="{@docRoot}training/enterprise/app-restrictions.html">App Configuration framework</a> to let an administrator remotely configure app settings such as: <ul> <li>Server address and protocol settings</li> <li>The ability to switch features on and off</li> diff --git a/docs/html/distribute/index.jd b/docs/html/distribute/index.jd index c8928df..a6ece63 100644 --- a/docs/html/distribute/index.jd +++ b/docs/html/distribute/index.jd @@ -43,11 +43,11 @@ page.metaDescription=The most visited store in the world for Android apps. Cloud <span class="dac-sprite dac-auto-chevron"></span> Get started </a></li> - <li class="dac-section-link"><a href="/distribute/essentials/index.html#quality-guidelines"> + <li class="dac-section-link"><a href="/distribute/essentials/index.html#guidelines"> <span class="dac-sprite dac-auto-chevron"></span> Quality guidelines </a></li> - <li class="dac-section-link"><a href="/distribute/essentials/index.html#tools-and-resources"> + <li class="dac-section-link"><a href="/distribute/essentials/index.html#tools"> <span class="dac-sprite dac-auto-chevron"></span> Resources & tools </a></li> diff --git a/docs/html/distribute/users/app-invites.jd b/docs/html/distribute/users/app-invites.jd index ec9579d..e19e6eb 100644 --- a/docs/html/distribute/users/app-invites.jd +++ b/docs/html/distribute/users/app-invites.jd @@ -1,7 +1,7 @@ page.title=Smarter App Invites page.metaDescription=Tap into your existing user base to increase downloads and increase conversions. page.tags="google", "identity", "signin" -page.image=distribute/images/advertising.jpg +page.image=images/cards/card-app-invites_16-9_2x.png @jd:body diff --git a/docs/html/distribute/users/house-ads.jd b/docs/html/distribute/users/house-ads.jd index d662fb2..ec73393 100644 --- a/docs/html/distribute/users/house-ads.jd +++ b/docs/html/distribute/users/house-ads.jd @@ -1,4 +1,4 @@ -page.title=Cross-Sell to Users with House Ads +page.title=Cross-Sell with House Ads page.metaDescription=Tap into your existing user base to increase downloads and increase conversions. page.tags="google", "identity", "signin" page.image=distribute/images/advertising.jpg diff --git a/docs/html/distribute/users/index.jd b/docs/html/distribute/users/index.jd index 4da4077..23f08c4 100644 --- a/docs/html/distribute/users/index.jd +++ b/docs/html/distribute/users/index.jd @@ -13,13 +13,13 @@ nonavpage=true <div class="resource-widget resource-flow-layout landing col-16" data-query="collection:distribute/users" data-cardSizes="6x6" - data-maxResults="9"> + data-maxResults="15"> </div> -<div class="resource-widget resource-flow-layout landing col-16" +<!--<div class="resource-widget resource-flow-layout landing col-16" data-query="collection:distribute/users" data-cardSizes="9x3" data-maxResults="16"> -</div> +</div>--> <!-- <h2>Related resources</h2> diff --git a/docs/html/google/index.jd b/docs/html/google/index.jd index e3b2ae1..2d3ee05 100644 --- a/docs/html/google/index.jd +++ b/docs/html/google/index.jd @@ -11,7 +11,7 @@ footer.hide=1 <div class="wrap"> <div class="cols dac-hero-content"> <div class="col-1of2 col-push-1of2 dac-hero-figure"> - <img class="dac-hero-image" src="/images/google/hero-play-services_2x.png" style="height:400px"> + <img class="dac-hero-image" src="{@docRoot}images/google/hero-play-services_2x.png" style="height:400px"> </div> <div class="col-1of2 col-pull-1of2"> <h1 class="dac-hero-title">Build better apps with Google</h1> @@ -21,11 +21,11 @@ footer.hide=1 <p class="dac-hero-description">Start by setting up the Google Play services library, then build with the APIs you need. </p> - <a class="dac-hero-cta" href="https://developers.google.com/android/guides/"> + <a class="dac-hero-cta" href="{@docRoot}google/play-services/index.html"> <span class="dac-sprite dac-auto-chevron"></span> Set up Google Play services </a><br> - <a class="dac-hero-cta" href="https://developers.google.com/android/reference/"> + <a class="dac-hero-cta" href="{@docRoot}reference/gms-packages.html"> <span class="dac-sprite dac-auto-chevron"></span> API Reference </a><br> diff --git a/docs/html/images/cards/card-app-invites_16-9_2x.png b/docs/html/images/cards/card-app-invites_16-9_2x.png Binary files differnew file mode 100644 index 0000000..e0da07e --- /dev/null +++ b/docs/html/images/cards/card-app-invites_16-9_2x.png diff --git a/docs/html/images/cards/card-app-linking_2x.png b/docs/html/images/cards/card-app-linking_2x.png Binary files differnew file mode 100644 index 0000000..abff805 --- /dev/null +++ b/docs/html/images/cards/card-app-linking_2x.png diff --git a/docs/html/images/cards/card-auto-backup_2x.png b/docs/html/images/cards/card-auto-backup_2x.png Binary files differnew file mode 100644 index 0000000..3c79ba9 --- /dev/null +++ b/docs/html/images/cards/card-auto-backup_2x.png diff --git a/docs/html/images/cards/card-test-performance_2x.png b/docs/html/images/cards/card-test-performance_2x.png Binary files differnew file mode 100644 index 0000000..fd949c8 --- /dev/null +++ b/docs/html/images/cards/card-test-performance_2x.png diff --git a/docs/html/images/google/hero-play-services_2x.png b/docs/html/images/google/hero-play-services_2x.png Binary files differindex 118e7a7..c9436f1 100644 --- a/docs/html/images/google/hero-play-services_2x.png +++ b/docs/html/images/google/hero-play-services_2x.png diff --git a/docs/html/images/permissions_check.png b/docs/html/images/permissions_check.png Binary files differnew file mode 100644 index 0000000..376d0fa --- /dev/null +++ b/docs/html/images/permissions_check.png diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js index 46d81e5..073feb8 100644 --- a/docs/html/jd_collections.js +++ b/docs/html/jd_collections.js @@ -125,7 +125,7 @@ var RESOURCE_COLLECTIONS = { "https://developers.google.com/maps/documentation/android/", "https://developers.google.com/identity/sign-in/android/", "https://developers.google.com/mobile-ads-sdk/download", - "https://developers.google.com/gcm/android/", + "https://developers.google.com/cloud-messaging/gcm", "https://developers.google.com/app-indexing/" ] }, @@ -151,7 +151,7 @@ var RESOURCE_COLLECTIONS = { "https://www.udacity.com/course/ux-design-for-mobile-developers--ud849", "https://www.udacity.com/course/developing-android-apps--ud853", "https://www.udacity.com/course/android-performance--ud825", - "https://www.udacity.com/android-nanodegree", + "https://www.udacity.com/android", "https://www.udacity.com/course/advanced-android-app-development--ud855", "https://www.udacity.com/course/android-ubiquitous-computing--ud875", "https://www.udacity.com/course/google-play-services--ud876", @@ -160,12 +160,15 @@ var RESOURCE_COLLECTIONS = { "https://www.udacity.com/course/gradle-for-android-and-java--ud867" ] }, - "preview/landing/herolinks": { + "preview/landing/more": { "title": "", "resources": [ - "https://www.udacity.com/course/ux-design-for-mobile-developers--ud849", - "https://www.udacity.com/course/developing-android-apps--ud853", - "https://www.udacity.com/course/android-performance--ud825" + "preview/features/runtime-permissions.html", + "preview/behavior-changes.html", + "preview/backup/index.html", + "preview/features/app-linking.html", + "preview/testing/guide.html", + "preview/testing/performance.html", ] }, "distribute/landing/carousel": { @@ -974,9 +977,8 @@ var RESOURCE_COLLECTIONS = { "distribute/engage/gcm": { "title": "", "resources": [ - "google/gcm/index.html", - "http://developer.chrome.com/apps/cloudMessagingV2", - "http://www.youtube.com/watch?v=y76rjidm8cU" + "https://developers.google.com/cloud-messaging/gcm", + "https://developers.google.com/cloud-messaging/android/client", ] }, "distribute/engage/googleplaygames": { diff --git a/docs/html/jd_extras.js b/docs/html/jd_extras.js index 54343eb..90a9875 100644 --- a/docs/html/jd_extras.js +++ b/docs/html/jd_extras.js @@ -132,11 +132,22 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([ "image":"images/cards/card-places_2x.png", "type":"Guide" }, - { + { + "title":"GCM Client for Android", + "titleFriendly":"", + "summary":"Send push notifications and pubsub from your server to Android devices around the world.", + "url":"https://developers.google.com/cloud-messaging/android/client", + "group":"", + "keywords": ["push","gcm"], + "tags": [], + "image":"images/cards/card-google-cloud-messaging_16-9_2x.png", + "type":"Guide" + }, + { "title":"Google Cloud Messaging", "titleFriendly":"", - "summary":"Send push notifications and pubsub from your server to your users’ devices around the world.", - "url":"https://developers.google.com/gcm/android/", + "summary":"Learn about GCM and the kinds of services you can offer to users through push notifications", + "url":"https://developers.google.com/cloud-messaging/gcm", "group":"", "keywords": ["push","gcm"], "tags": [], diff --git a/docs/html/preview/api-changes.jd b/docs/html/preview/api-changes.jd deleted file mode 100644 index 8ea91dd..0000000 --- a/docs/html/preview/api-changes.jd +++ /dev/null @@ -1,338 +0,0 @@ -page.title=Behavior Changes -page.keywords=preview,sdk,compatibility -page.tags=previewresources, androidm -@jd:body - -<div id="qv-wrapper"> -<div id="qv"> - -<h2>In this document</h2> - -<ol id="toc44" class="hide-nested"> - <li><a href="#behavior-runtime-permissions">Runtime Permissions</a></li> - <li><a href="#behavior-notifications">Notifications</a></li> - <li><a href="#behavior-openssl">OpenSSL</a></li> - <li><a href="#behavior-project-volta">Project Volta</a> - <ol> - <li><a href="#behavior-doze">Doze Mode</a></li> - <li><a href="#behavior-app-standby">App Standby Mode</a></li> - </ol> - </li> - <li><a href="#behavior-adoptable-storage">Adoptable Storage Devices</a></li> - <li><a href="#behavior-apache-http-client">Apache HTTP Client Removal</a></li> - <li><a href="#behavior-audiomanager-Changes">AudioManager Changes</a></li> - <li><a href="#behavior-test-selection">Text Selection</a></li> - <li><a href="#behavior-keystore">Android Keystore Changes</a></li> - <li><a href="#behavior-themeable-colorstatelists">Themeable ColorStateLists</a></li> - <li><a href="#night-mode">Night Mode</a></li> - <li><a href="#behavior-art-runtime">ART Runtime</a></li> - <li><a href="#behavior-afw">Android for Work Changes</a></li> -</ol> - -<h2>API Differences</h2> -<ol> -<li><a href="">API level 22 to M »</a> </li> -</ol> - - -<h2>See Also</h2> -<ol> -<li><a href="{@docRoot}preview/api-overview.html">M Developer Preview API Overview</a> </li> -</ol> - -</div> -</div> - -<p>API Level: M</p> -<p>Along with new features and capabilities, M includes a variety of -system changes and API behavior changes. This document highlights -some of the key changes that you should be understand and account for in your apps.</p> - -<p>If you have previously published an app for Android, be aware that your app - might be affected by these changes in M.</p> - -<h2 id="behavior-runtime-permissions">Runtime Permissions</h1> -<p>This release introduces a new runtime permissions model, where users can now directly manage -their app permissions at runtime. This model gives users improved visibility and control over -permissions, while streamlining the installation and auto-update processes for app developers. -Users can set permissions on or off for all apps running on Android M. However, apps that don’t -target M cannot request permissions at runtime.</p> - -<p>On your apps that target M, make sure to check and request for permissions at -runtime. To determine if your app has been granted a permission, call the -new {@code Context.checkSelfPermission()} method. To request for a permission, call the new -{@code Activity.requestPermission()} method.</p> - -<p>For more information on supporting the new permissions model in your app, see the -<a href="{@docRoot}preview/features/runtime-permissions.html"> -Android M Runtime Permissions guide</a>.</p> - -<h2 id="behavior-openssl">OpenSSL</h2> -<p>Android is moving away from OpenSSL to the -<a href="https://boringssl.googlesource.com/boringssl/" class="external-link">BoringSSL</a> -library. If you’re using the Android NDK in your app, don't link against cryptographic libraries -that are not a part of the NDK API, such as {@code libcrypto.so} and {@code libssl.so}. These -libraries are not public APIs, and may change or break without notice across releases and devices. -In addition, you may expose yourself to security vulnerabilities. Instead, modify your -native code to call the Java cryptography APIs via JNI or to statically link against a -cryptography library of your choice.</p> - -<h2 id="behavior-project-volta">Project Volta</h2> -<p>This release introduces new power-saving optimizations for idle devices and apps.</p> - -<h3 id="behavior-doze">Doze mode</h3> -<p>If a device is unplugged and not used for up to an hour, it goes into <em>doze</em> mode where -it attempts to keep the system in a sleep state. In this mode, devices may briefly resume normal -operations for up to 5 minutes every few hours so that app syncing can occur and the system can -perform any pending operations.</p> - -<p>The following restrictions apply to your apps while in device doze mode:</p> -<ul> -<li>Network access is disabled</li> -<li>Alarms scheduled with the {@link android.app.AlarmManager} class are disabled, except for -alarms that you've set with the -{@link android.app.AlarmManager#setAlarmClock(android.app.AlarmManager.AlarmClockInfo,android.app.PendingIntent) setAlarmClock()} -method</li> -<li>WiFi scans are not performed</li> -<li>Syncs and jobs for your sync adapters and {@link android.app.job.JobScheduler} are not -permitted to run</li> -</ul> -</p> -<p>When the system comes out of doze mode, it executes jobs and syncs that are pending.</p> - -<h3 id="behavior-app-standby">App standby mode</h3> -<p>In M, the system may determine that apps are idle when they are not in active use by the user. -Your app goes into <em>app standby</em> mode after two days unless the system detects any of these -signals:</p> - -<ul> -<li>The app has a process currently in the foreground (either as an activity or foreground service, -or in use by another activity or foreground service)</li> -<li>The app generates a notification that the user can see</li> -<li>The user explicitly asks for the app to remain running</li> -</ul> - -<p>If the system is running on battery power, apps that are in standby mode will have their -network access disabled and their syncs and jobs suspended. When the system is plugged into a power -supply, it brings an app out of standby mode and executes any jobs and syncs that are pending.</p> - -<p>Apps that use <a href="{@docRoot}google/gcm/index.html">Google Cloud Messaging</a> will -continue to receive messages even if they are idle. When the system is plugged into a power -supply, apps resume normal operations and can run any pending syncs and jobs.</p> - -<p>You can test this feature by connecting a device running M to your development machine and -calling the following commands: -</p> -<pre> -$ adb shell am broadcast -a android.os.action.DISCHARGING -$ adb shell am set-idle <packageName> true -$ adb shell am set-idle <packageName> false -$ adb shell am get-idle <packageName> -</pre> - -<h2 id="behavior-adoptable-storage">Adoptable Storage Devices</h2> -<p> -In M, users can adopt external storage devices such as SD cards. Adopting an external storage -device encrypts and formats the device to behave like internal storage. This feature allows users -to move both apps and private data of those apps between storage devices. When moving apps, the -system respects the <a href="{@docRoot}guide/topics/manifest/manifest-element.html#install"> -{@code android:installLocation}</a> preference in the manifest.</p> - -<p>If your app accesses the following APIs or fields, be aware that the file paths they return -will dynamically change when the app is moved between internal and external storage devices. -When building file paths, it is strongly recommended that you always call these APIs dynamically. -Don’t use hardcoded file paths or persist fully-qualified file paths that were built previously.</p> - -<ul> -<li>{@link android.content.Context} methods: - <ul> - <li>{@link android.content.Context#getFilesDir() getFilesDir()}</li> - <li>{@link android.content.Context#getCacheDir() getCacheDir()}</li> - <li>{@link android.content.Context#getCodeCacheDir() getCodeCacheDir()}</li> - <li>{@link android.content.Context#getDatabasePath(java.lang.String) getDatabasePath()}</li> - <li>{@link android.content.Context#getDir(java.lang.String,int) getDir()}</li> - <li>{@link android.content.Context#getNoBackupFilesDir() getNoBackupFilesDir()}</li> - <li>{@link android.content.Context#getFileStreamPath(java.lang.String) getFileStreamPath()}</li> - <li>{@link android.content.Context#getPackageCodePath() getPackageCodePath()}</li> - <li>{@link android.content.Context#getPackageResourcePath() getPackageResourcePath()}</li> - </ul> -</li> -<li>{@link android.content.pm.ApplicationInfo} fields: - <ul> - <li>{@link android.content.pm.ApplicationInfo#dataDir dataDir}</li> - <li>{@link android.content.pm.ApplicationInfo#sourceDir sourceDir}</li> - <li>{@link android.content.pm.ApplicationInfo#nativeLibraryDir nativeLibraryDir}</li> - <li>{@link android.content.pm.ApplicationInfo#publicSourceDir publicSourceDir}</li> - <li>{@link android.content.pm.ApplicationInfo#splitSourceDirs splitSourceDirs}</li> - <li>{@link android.content.pm.ApplicationInfo#splitPublicSourceDirs splitPublicSourceDirs}</li> - </ul> -</li> -</ul> - -<p>To debug this feature in the developer preview, you can enable adoption of a USB drive that is -connected to an Android device through a USB On-The-Go (OTG) cable, by running these -commands:</p> - -<pre> -$ adb root -$ sleep 2 -$ adb shell setprop persist.fw.force_adoptable 1 -$ adb reboot -</pre> - -<h2 id="behavior-apache-http-client">Apache HTTP Client Removal</h2> -<p>This release removes support for the Apache HTTP client. If your app is using this client and -targets Android 2.3 (API level 9) or higher, use the {@link java.net.HttpURLConnection} class -instead. This API is more efficient because it reduces network use through transparent compression -and response caching, and minimizes power consumption. To continue using the Apache HTTP APIs, you -must first declare the following compile-time dependency in your {@code build.gradle} file: -</p> -<pre> -android { - compileSdkVersion M - useLibrary 'org.apache.http.legacy' -} -</pre> - -<h2 id="behavior-audiomanager-Changes">AudioManager Changes</h2> -<p>Setting the volume directly or muting specific streams via the {@link android.media.AudioManager} -class is no longer supported. The {@link android.media.AudioManager#setStreamSolo(int,boolean) -setStreamSolo()} method is deprecated, and you should call the -{@code AudioManager.requestAudioFocus()} method instead. Similarly, the -{@link android.media.AudioManager#setStreamMute(int,boolean) setStreamMute()} method is -deprecated; instead, call the {@code AudioManager.adjustStreamVolume()} method -and pass in the direction value {@code ADJUST_MUTE} or {@code ADJUST_UNMUTE}.</p> - -<h2 id="behavior-test-selection">Text Selection</h2> - -<img src="{@docRoot}preview/images/text-selection.gif" -style="float:right; margin:0 0 20px 30px" width="270" height="480" /> - -<p>When users selects text in your app, you can now display text selection actions such as -<em>Cut</em>, <em>Copy</em>, and <em>Paste</em> in a -<a href="http://www.google.com/design/spec/patterns/selection.html#selection-text-selection" -class="external-link">floating toolbar</a>. The user interaction implementation is similar to that -for the contextual action bar, as described in -<a href="{@docRoot}guide/topics/ui/menus.html#CABforViews"> -Enabling the contextual action mode for individual views</a>.</p> - -<p>To implement a floating toolbar for text selection, make the following changes in your existing -apps:</p> -<ol> -<li>In your {@link android.view.View} or {@link android.app.Activity} object, change your -{@link android.view.ActionMode} calls from -{@code startActionMode(Callback)} to {@code startActionMode(Callback, ActionMode.TYPE_FLOATING)}.</li> -<li>Take your existing implementation of ActionMode.Callback and make it extend -{@code ActionMode.Callback2} instead.</li> -<li>Override the {@code Callback2.onGetContentRect()} method to provide the coordinates of the -content {@link android.graphics.Rect} object (such as a text selection rectangle) in the view.</li> -<li>If the rectangle positioning is no longer valid, and this is the only element to be invalidated, -call the {@code ActionMode.invalidateContentRect()} method.</li> -</ol> - -<p>If you are using <a href="{@docRoot}tools/support-library/index.html"> -Android Support Library</a> revision 22.2, be aware that floating toolbars are not -backward-compatible and appcompat takes control over {@link android.view.ActionMode} objects by -default. This prevents floating toolbars from being displayed in M. To enable -{@link android.view.ActionMode} support in an -{@link android.support.v7.app.AppCompatActivity}, call -{@code android.support.v7.app.AppCompatActivity.getDelegate()}, then call -{@code android.support.v7.app.AppCompatDelegate.setHandleNativeActionModesEnabled()} on the returned -{@link android.support.v7.app.AppCompatDelegate} object and set the input -parameter to {@code false}. This call returns control of {@link android.view.ActionMode} objects to -the framework. In devices running M, that allows the framework to support -{@link android.support.v7.app.ActionBar} or floating toolbar modes, while on pre-M devices, only the -{@link android.support.v7.app.ActionBar} modes are supported.</p> - -<h2 id="behavior-keystore">Android Keystore Changes</h2> -<p>Starting this release, the -<a href="{@docRoot}training/articles/keystore.html">Android Keystore provider</a> no longer supports -DSA. ECDSA is still supported.</p> - -<p>Keys which do not require encryption at rest will no longer be deleted when secure lock screen -is disabled or reset (for example, by the user or a Device Administrator). Keys which require -encryption at rest will be deleted during these events.</p> - -<h2 id="behavior-themeable-colorstatelists">Themeable ColorStateLists</h2> -<p>Theme attributes are now supported in -{@link android.content.res.ColorStateList} for devices running M. The -{@link android.content.res.Resources#getColorStateList(int) getColorStateList()} and -{@link android.content.res.Resources#getColor(int) getColor()} methods have been deprecated. If -you are calling these APIs, call the new {@code Context.getColorStateList()} or -{@code Context.getColor()} methods instead. These methods are also available in the -v4 appcompat library via {@link android.support.v4.content.ContextCompat}.</p> - -<h2 id="night-mode">Night Mode (User-configurable Dark Theme)</h2> -<p> -Support for the {@code -night} resource qualifier has been updated in M. Previously, night mode was -only available when a device was docked and in car mode. Starting in M, night mode is available on -all devices and is user-configurable via <em>Settings > Display > Theme</em>. You can adjust this -setting globally using {@link android.app.UiModeManager#setNightMode(int) setNightMode()}. The -Dark theme corresponds to {@link android.app.UiModeManager#MODE_NIGHT_YES}. When the device is in -night mode, the resource framework will prefer resources that have the -night qualifier. To -take advantage of user-configurable Dark mode in your app, extend from the -{@code Theme.Material.DayNight} set of themes rather than {@code Theme.Material} or -{@code Theme.Material.Light}. -</p> - -<h2 id="behavior-art-runtime">ART Runtime</h2> -<p>The ART runtime now properly implements access rules for the -{@link java.lang.reflect.Constructor#newInstance(java.lang.Object...) newInstance()} method. This -change fixes a problem where Dalvik was checking access rules incorrectly in previous versions. -If your app uses the -{@link java.lang.reflect.Constructor#newInstance(java.lang.Object...) newInstance()} method and you -want to override access checks, call the -{@link java.lang.reflect.Constructor#setAccessible(boolean) setAccessible()} method with the input -parameter set to {@code true}. If your app uses the -<a href="{@docRoot}tools/support-library/features.html#v7">v7 appcompat library</a> or the -<a href="{@docRoot}tools/support-library/features.html#v7-recyclerview">v7 recyclerview library</a>, -you must update your app to use to the latest versions of these libraries. Otherwise, make sure that -any custom classes referenced from XML are updated so that their class constructors are accessible.</p> - -<p>The M release updates the behavior of the dynamic linker. The dynamic linker now understands the -difference between a library’s {@code soname} and its path -(<a href="https://code.google.com/p/android/issues/detail?id=6670" class="external-link"> -public bug 6670</a>), and search by {@code soname} is now -implemented. Apps which previously worked that have bad {@code DT_NEEDED} entries -(usually absolute paths on the build machine’s file system) may fail when loaded on M.</p> - -<p>The {@code dlopen(3) RTLD_LOCAL} flag is now correctly implemented in M. Note that -{@code RTLD_LOCAL} is the default, so calls to {@code dlopen(3)} that didn’t explicitly use -{@code RTLD_LOCAL} will be affected (unless your app explicitly used {@code RTLD_GLOBAL}). With -{@code RTLD_LOCAL}, symbols will not be made available to libraries loaded by later calls to -{@code dlopen(3)} (as opposed to being referenced by {@code DT_NEEDED} entries).</p> -</p> - -<h2 id="behavior-afw">Android for Work Changes</h2> -<p>This release includes the following behavior changes for Android for Work:</p> -<ul> -<li><strong>Work contacts in personal contexts.</strong> Google Messenger and the Google Dialer -Call Log now display work contacts when the user views past messages or calls. Furthermore, both -work and personal contacts are now available to devices over Bluetooth, but you can hide work -profile contacts through a device policy by calling the new -{@code DevicePolicyManager.setBluetoothContactSharingDisabled()} method. Initiating a call or -creating a new message will only show personal contacts, as consistent with the experience in -Android 5.0. -</li> -<li><strong>WiFi configuration removal:</strong> WiFi configurations added by a Profile Owner -(for example, through calls to the -{@link android.net.wifi.WifiManager#addNetwork(android.net.wifi.WifiConfiguration) -addNetwork()} method) are now removed if that work profile is deleted.</li> -<li><strong>WiFi configuration lockdown:</strong> Any WiFi configuration created by an active Device -Owner can no longer be modified or deleted by the user. The user can still create and -modify their own WiFi configurations, so long as the {@link android.os.UserManager} constant -{@link android.os.UserManager#DISALLOW_CONFIG_WIFI} has not been set for that user.</li> -<li><strong>VPN in Settings:</strong> VPN apps are now visible in <em>Settings > More > VPN</em>. -Additionally, the notifications that accompany VPN usage are now specific to whether that VPN is -configured for a managed profile or the entire device.</li> -<li><strong>Work status notification:</strong> A status bar briefcase icon now appears whenever -an app from the managed profile has an activity in the foreground. Furthermore, if the device is -unlocked directly to the activity of an app in the managed profile, a toast is displayed notifying -the user that they are within the work profile. -</li> -<li><strong>Download Work Policy Controller via Google account addition:</strong> When a Google -account that requires management via a Work Policy Controller (WPC) app is added to a device -outside of a managed context, the add account flow now prompts the user to install the -appropriate WPC. This behavior also applies to accounts added via -<em>Settings > Accounts</em> in the initial device setup wizard.</li> -</ul> diff --git a/docs/html/preview/api-overview.jd b/docs/html/preview/api-overview.jd index bf5eec4..5fd6bb8 100644 --- a/docs/html/preview/api-overview.jd +++ b/docs/html/preview/api-overview.jd @@ -15,12 +15,13 @@ page.image=images/cards/card-api-overview_16-9_2x.png <span class="less" style="display:none">show less</span></a></h2> <ol id="toc44" class="hide-nested"> - <li><a href="#backup">Automatic App Data Backup</a></li> + <li><a href="#app-linking">App Linking</a></li> + <li><a href="#backup">Auto Backup for Apps</a></li> <li><a href="#authentication">Authentication</a> - <ul> + <ol> <li><a href="#fingerprint-authentication">Fingerprint Authentication</a></li> <li><a href="#confirm-credentials">Confirm Credentials</a></li> - </ul> + </ol> </li> <li><a href="#direct-share">Direct Share</a></li> <li><a href="#voice-interactions">Voice Interactions</a></li> @@ -34,10 +35,10 @@ page.image=images/cards/card-api-overview_16-9_2x.png <li><a href="#audio">Audio Features</a></li> <li><a href="#video">Video Features</a></li> <li><a href="#camera">Camera Features</a> - <ul> + <ol> <li><a href="#flashlight">Flashlight API</a></li> <li><a href="#reprocessing">Camera Reprocessing</a></li> - </ul> + </ol> </li> <li><a href="#afw">Android for Work Features</a></li> </ol> @@ -77,12 +78,19 @@ by changes in the platform.</p> <p>Please see <a href="behavior-changes.html">Behavior Changes</a> for complete information.</p> -<h2 id="backup">Automatic App Data Backup</h2> +<h2 id="app-linking">App Linking</h2> +<p>This preview enhances Android’s intent system by providing more powerful app linking. +This feature allows you to associate an app with a web domain you own. Based on this +association, the platform can determine the default app to use to handle a particular +web link and skip prompting users to select an app. To learn how to implement this feature, see +<a href="{@docRoot}preview/features/app-linking.html">App Linking</a>. + +<h2 id="backup">Auto Backup for Apps</h2> <p>The system now performs automatic full data backup and restore for apps. This behavior is enabled by default for apps targeting M Preview; you do not need to add any additional code. If users delete their Google accounts, their backup data is deleted as well. To learn how this feature works and how to configure what to back up on the file system, see -<a href="{@docRoot}preview/backup/index.html">Automatic App Data Backup</a>.</p> +<a href="{@docRoot}preview/backup/index.html">Auto Backup for Apps</a>.</p> <h2 id="authentication">Authentication</h2> <p>This preview offers new APIs to let you authenticate users by using their fingerprint scans on @@ -121,9 +129,9 @@ style="float:right; margin:0 0 10px 20px" width="282" height="476" /> <p>If you are testing this feature, follow these steps:</p> <ol> +<li>Install Android SDK Tools Revision 24.3, if you have not done so.</li> <li>Enroll a new fingerprint in the emulator by going to <strong>Settings > Security > Fingerprint</strong>, then follow the enrollment instructions.</li> -<li>Install Android SDK Tools Revision 24.3, if you have not done so.</li> <li>Use an emulator to emulate fingerprint touch events with the following command. Use the same command to emulate fingerprint touch events on the lockscreen or in your app. @@ -137,39 +145,42 @@ adb -e emu finger touch <finger_id> </ol> <h3 id="confirm-credentials">Confirm Credentials</h3> -<p>Your app can authenticate users based on how recently they last unlocked their device. You can -use the same public or secret key to authenticate users. This feature frees -users from having to remember additional app-specific passwords, and avoids the need for you to -implement your own authentication user interface.</p> - -<p>You can set your own authentication policy by setting constraints against the key that you are -generating or importing. To set the constraints for using a key, use the -{@code android.security.KeyPairGeneratorSpec.Builder} and -{@code android.security.KeyGeneratorSpec.Builder} classes for public key pairs and secret keys -respectively. If you are importing keys, use the {@link android.security.KeyStoreParameter.Builder} -class to set your constraints. You can use the +<p>Your app can authenticate users based on how recently they last unlocked their device. This +feature frees users from having to remember additional app-specific passwords, and avoids the need +for you to implement your own authentication user interface. Your app should use this feature in +conjunction with a public or secret key implementation for user authentication.</p> + +<p>To set the timeout duration for which the same key can be re-used after a user is successfully +authenticated, call the new +{@code android.security.keystore.KeyGenParameterSpec.setUserAuthenticationValidityDurationSeconds()} +method when you set up a {@link javax.crypto.KeyGenerator} or +{@link java.security.KeyPairGenerator}. This feature currently works for symmetric cryptographic +operations.</p> + +<p>Avoid showing the re-authentication dialog excessively -- your apps should try using the +cryptographic object first and if the the timeout expires, use the {@link android.app.KeyguardManager#createConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence) createConfirmDeviceCredentialIntent()} -method to re-authenticate the user within your app if the timeout expired. +method to re-authenticate the user within your app. </p> <p>To see an app implementation of this feature, refer to the -<a href="https://github.com/googlesamples/android-ConfirmDeviceCredentials" class="external-link"> +<a href="https://github.com/googlesamples/android-ConfirmCredentials" class="external-link"> Confirm Device Credentials sample</a>.</p> <h2 id="direct-share">Direct Share</h2> <img src="{@docRoot}preview/images/direct-share-screen_2x.png" srcset="{@docRoot}preview/images/direct-share-screen.png 1x, preview/images/direct-share-screen_2x.png 2x" -style="float:right; margin:0 0 20px 30px" width="312" height="385" /> +style="float:right; margin:0 0 20px 30px" width="312" height="335" /> -<p>This preview provides you with APIs to makes sharing intuitive and quick for users. You can now -define <em>deep links</em> that target a specific activity in your app. These deep links are -exposed to users via the <em>Share</em> menu. This feature allows users to share content to -targets, such as contacts, within other apps. For example, the deep link might launch an -activity in another social network app, which lets the user share content directly to a specific -friend or community in that app.</p> +<p>This preview provides you with APIs to make sharing intuitive and quick for users. You can now +define <em>direct share targets</em> that launch a specific activity in your app. These direct share +targets are exposed to users via the <em>Share</em> menu. This feature allows users to share +content to targets, such as contacts, within other apps. For example, the direct share target might +launch an activity in another social network app, which lets the user share content directly to a +specific friend or community in that app.</p> -<p>To enable sharing via deep links, you must define a class that extends the +<p>To enable direct share targets you must define a class that extends the {@code android.service.} <br> {@code chooser.ChooserTargetService} class. Declare your {@code ChooserTargetService} in the manifest. Within that declaration, specify the @@ -203,10 +214,6 @@ manifest.</p> android:value=".ChooserTargetService" /> </activity> </pre> -<p>To see an app implementation of this feature, refer to the -<a href="https://github.com/googlesamples/android-DeepLinkSharing" class="external-link"> - Deep Link Sharing sample</a>.</p> - <h2 id="voice-interactions">Voice Interactions</h2> <p> @@ -226,9 +233,10 @@ class="external-link">Voice Actions developer site</a>. This preview offers a new way for users to engage with your apps through an assistant. To use this feature, the user must enable the assistant to use the current context. Once enabled, the user can summon the assistant within any app, by long-pressing on the <strong>Home</strong> button.</p> -<p>The platform passes the current context to the assistant. In addition to the standard set of -information that the platform passes to the assistant, your app can share additional information -by using the new {@code android.app.Activity.AssistContent} class.</p> +<p>Your app can elect to not share the current context with the assistant by setting the +{@link android.view.WindowManager.LayoutParams#FLAG_SECURE} flag. In addition to the +standard set of information that the platform passes to the assistant, your app can share +additional information by using the new {@code android.app.Activity.AssistContent} class.</p> <p>To provide the assistant with additional context from your app, follow these steps:</p> @@ -324,9 +332,6 @@ feature is useful if you want to switch to 4K display resolution. While in 4K di UI continues to be rendered at the original resolution (such as 1080p) and is upscaled to 4K, but {@link android.view.SurfaceView} objects may show content at the native resolution.</p> -<p>To test the new 4K display mode, simulate a secondary display of a larger resolution using the -<strong>Developer Options</strong> settings.</p> - <h2 id="behavior-themeable-colorstatelists">Themeable ColorStateLists</h2> <p>Theme attributes are now supported in {@link android.content.res.ColorStateList} for devices running the M Preview. The @@ -494,22 +499,16 @@ Google credentials. <p>Additionally, by setting app restrictions on Google Play services, Device Owners can specify alternative Google accounts for unlocking FRP to replace the ones activated on the device.</p> </li> +<img src="{@docRoot}preview/images/work-profile-screen_2x.png" +srcset="{@docRoot}preview/images/work-profile-screen.png 1x, preview/images/work-profile-screen_2x.png 2x" +style="float:right; margin:0 0 10px 20px" width="282" height="476" /> <li><strong>Data usage tracking.</strong> A Profile or Device Owner can now query for the data usage statistics visible in <strong>Settings > Data</strong> usage by using the new {@code android.app.usage.NetworkStatsManager} methods. Profile Owners are automatically granted permission to query data on the profile they manage, while Device Owners get access to usage data of the managed primary user.</li> -<li><strong>Runtime permission management:</strong> With the new runtime permissions model, a -Profile or Device Owner can now silently grant or revoke an app’s permissions by calling -{@code DevicePolicyManager.setPermissionGranted()}. Granting or revoking a single permission applies -that setting to all permissions within that runtime permission group; the user is not prompted -at runtime when any permission from that runtime permission group is required. Furthermore, the -user cannot modify the selection made by the Profile or Device Owner within the app’s permissions -screen in <strong>Settings</strong>. -<img src="{@docRoot}preview/images/work-profile-screen_2x.png" -srcset="{@docRoot}preview/images/work-profile-screen.png 1x, preview/images/work-profile-screen_2x.png 2x" -style="float:right; margin:0 0 10px 20px" width="282" height="476" /> -<p>A Profile or Device Owner can also set a permission policy +<li><strong>Runtime permission management:</strong> +<p>A Profile or Device Owner can set a permission policy for all runtime requests of all applications using {@code DevicePolicyManager.setPermissionPolicy()}, to either prompt the user to grant the permission as normal or automatically grant or deny the permission silently. If the latter policy @@ -517,8 +516,10 @@ is set, the user cannot modify the selection made by the Profile or Device Owner app’s permissions screen in <strong>Settings</strong>.</p></li> <li><strong>VPN in Settings:</strong> VPN apps are now visible in <strong>Settings > More > VPN</strong>. -Additionally, the notifications that accompany VPN usage are now specific to whether that VPN is -configured for a managed profile or the entire device.</li> +Additionally, the notifications that accompany VPN usage are now specific to how that VPN is +configured. For Profile Owner, the notifications are specific to whether the VPN is configured +for a managed profile, a personal profile, or both. For a Device Owner, the notifications are +specific to whether the VPN is configured for the entire device.</li> <li><strong>Work status notification:</strong> A status bar briefcase icon now appears whenever an app from the managed profile has an activity in the foreground. Furthermore, if the device is unlocked directly to the activity of an app in the managed profile, a toast is displayed notifying diff --git a/docs/html/preview/backup/index.jd b/docs/html/preview/backup/index.jd index 5953e30..6735379 100644 --- a/docs/html/preview/backup/index.jd +++ b/docs/html/preview/backup/index.jd @@ -1,7 +1,7 @@ page.title=Auto Backup for Apps page.tags=backup, previewresources, androidm page.keywords=backup, autobackup, preview - +page.image=images/cards/card-auto-backup_2x.png @jd:body <div id="qv-wrapper"> @@ -27,8 +27,8 @@ page.keywords=backup, autobackup, preview <p> Automatic backups are enabled for all apps installed on devices running the Android M Preview. No - additional app code is required. The system provides users with the ability opt out of automatic - data backups. You can also choose to limit what data from your app is backed up. + additional app code is required. The system provides users with the ability to opt out of + automatic data backups. You can also choose to limit what data from your app is backed up. </p> <p> @@ -106,8 +106,8 @@ page.keywords=backup, autobackup, preview <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="com.my.appexample"> - <uses-sdk android:minSdkVersion="9"/> - <uses-sdk android:targetSdkVersion="android-MNC"/> + <uses-sdk android:minSdkVersion="MNC"/> + <uses-sdk android:targetSdkVersion="MNC"/> <app ... <strong> android:fullBackupContent="@xml/mybackupscheme"></strong> </app> @@ -224,8 +224,8 @@ page.keywords=backup, autobackup, preview <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="com.my.appexample"> - <uses-sdk android:minSdkVersion="9"/> - <uses-sdk android:targetSdkVersion="android-MNC"/> + <uses-sdk android:minSdkVersion="MNC"/> + <uses-sdk android:targetSdkVersion="MNC"/> <app ... <strong> android:allowBackup="false"></strong> </app> diff --git a/docs/html/preview/behavior-changes.jd b/docs/html/preview/behavior-changes.jd index 0dd549b..9b3dbab 100644 --- a/docs/html/preview/behavior-changes.jd +++ b/docs/html/preview/behavior-changes.jd @@ -1,6 +1,6 @@ page.title=Behavior Changes page.keywords=preview,sdk,compatibility -sdk.platform.apiLevel=23 +sdk.platform.apiLevel=MNC @jd:body <div id="qv-wrapper"> @@ -10,9 +10,9 @@ sdk.platform.apiLevel=23 <ol id="toc44" class="hide-nested"> <li><a href="#behavior-runtime-permissions">Runtime Permissions</a></li> - <li><a href="#behavior-project-volta">Project Volta</a> + <li><a href="#behavior-power">Power-Saving Optimizations</a> <ol> - <li><a href="#behavior-doze">Doze mode</a></li> + <li><a href="#behavior-doze">Doze</a></li> <li><a href="#behavior-app-standby">App Standby</a></li> </ol> </li> @@ -21,7 +21,6 @@ sdk.platform.apiLevel=23 <li><a href="#behavior-audiomanager-Changes">AudioManager Changes</a></li> <li><a href="#behavior-test-selection">Text Selection</a></li> <li><a href="#behavior-keystore">Android Keystore Changes</a></li> - <li><a href="#night-mode">Night Mode</a></li> <li><a href="#behavior-network">Wi-Fi and Networking Changes</a></li> <li><a href="#behavior-camera">Camera Service Changes</a></li> <li><a href="#behavior-art-runtime">ART Runtime</a></li> @@ -43,10 +42,9 @@ sdk.platform.apiLevel=23 </div> </div> -<p>API Level: M</p> <p>Along with new features and capabilities, the M Developer Preview includes a variety of system changes and API behavior changes. This document highlights -some of the key changes that you should be understand and account for in your apps.</p> +some of the key changes that you should understand and account for in your apps.</p> <p>If you have previously published an app for Android, be aware that your app might be affected by these changes in the platform.</p> @@ -67,16 +65,16 @@ new {@code Context.checkSelfPermission()} method. To request for a permission, c <a href="{@docRoot}preview/features/runtime-permissions.html"> Android M Preview Runtime Permissions</a>.</p> -<h2 id="behavior-project-volta">Project Volta</h2> +<h2 id="behavior-power">Power-Saving Optimizations</h2> <p>This preview introduces new power-saving optimizations for idle devices and apps.</p> -<h3 id="behavior-doze">Doze mode</h3> +<h3 id="behavior-doze">Doze</h3> <p>If a device is unplugged and left stationary with the screen off for a period of time, it goes into <em>Doze</em> mode where it attempts to keep the system in a sleep state. In this mode, devices periodically resume normal operations for brief periods of time so that app syncing can occur and the system can perform any pending operations.</p> -<p>The following restrictions apply to your apps while in Doze mode:</p> +<p>The following restrictions apply to your apps while in Doze:</p> <ul> <li>Network access is disabled, unless your app receives a high priority Google Cloud Messaging tickle.</li> @@ -89,7 +87,7 @@ method and {@code AlarmManager.setAndAllowWhileIdle()}.</li> permitted to run.</li> </ul> </p> -<p>When the device exists doze mode, it executes any jobs and syncs that are pending.</p> +<p>When the device exits doze, it executes any jobs and syncs that are pending.</p> <p>You can test this feature by connecting a device running the M Preview to your development machine and calling the following commands: </p> @@ -98,10 +96,11 @@ $ adb shell dumpsys battery unplug $ adb shell dumpsys deviceidle step $ adb shell dumpsys deviceidle -h </pre> -<p class="note"><strong>Note</strong>: The upcmoning -<a href="{@docRoot}google/gcm/index.html">Google Cloud Messaging</a> release lets you designate +<p class="note"><strong>Note</strong>: The upcoming +<a href="https://developers.google.com/cloud-messaging/" class="external-link"> +Google Cloud Messaging</a> release lets you designate high-priority messages. If your app receives high-priority GCM messages, it’s granted -brief network access even when the device is in doze mode. +brief network access even when the device is in doze. </p> <h3 id="behavior-app-standby">App standby</h3> @@ -110,6 +109,7 @@ use. Your app is considered idle after a period of time, unless the system detec any of these signals:</p> <ul> +<li>The app is explicitly launched by the user.</li> <li>The app has a process currently in the foreground (either as an activity or foreground service, or in use by another activity or foreground service).</li> <li>The app generates a notification that users see on the lock screen or in the @@ -127,14 +127,15 @@ device is idle for long periods of time, idle apps are allowed network access ar machine and calling the following commands: </p> <pre class="no-prettyprint"> -$ adb shell am broadcast -a android.os.action.DISCHARGING +$ adb shell dumpsys battery unplug $ adb shell am set-idle <packageName> true $ adb shell am set-idle <packageName> false $ adb shell am get-idle <packageName> </pre> <p class="note"><strong>Note</strong>: The upcoming -<a href="{@docRoot}google/gcm/index.html">Google Cloud Messaging</a> (GCM) release lets you +<a href="https://developers.google.com/cloud-messaging/" class="external-link"> +Google Cloud Messaging</a> (GCM) release lets you designate high-priority messages. If your app receives high-priority GCM messages, it’s granted brief network access even when the app is idle. </p> @@ -266,20 +267,6 @@ DSA. ECDSA is still supported.</p> is disabled or reset (for example, by the user or a Device Administrator). Keys which require encryption at rest will be deleted during these events.</p> -<h2 id="night-mode">Night Mode (User-configurable Dark Theme)</h2> -<p> -Support for the {@code -night} resource qualifier has been updated. Previously, night mode was -only available when a device was docked and in car mode. With this preview, night mode is -available on -all devices and is user-configurable via <strong>Settings > Display > Theme</strong>. You can adjust -this setting globally using {@link android.app.UiModeManager#setNightMode(int) setNightMode()}. The -Dark theme corresponds to {@link android.app.UiModeManager#MODE_NIGHT_YES}. When the device is in -night mode, the resource framework prefers resources that have the {@code -night} qualifier. To -take advantage of user-configurable Dark mode in your app, extend from the -{@code Theme.Material.DayNight} set of themes rather than {@code Theme.Material} or -{@code Theme.Material.Light}. -</p> - <h2 id="behavior-network">Wi-Fi and Networking Changes</h2> <p>This preview introduces the following behavior changes to the Wi-Fi and networking APIs.</p> @@ -370,11 +357,12 @@ contents are removed.</p> <p>This preview includes the following behavior changes for Android for Work:</p> <ul> <li><strong>Work contacts in personal contexts.</strong> The Google Dialer -Call Log now displays work contacts when the user views past calls. Both -work and personal contacts are now available to devices over Bluetooth, but you can hide work -profile contacts through a device policy by calling the new -{@code DevicePolicyManager.setBluetoothContactSharingDisabled()} method. Initiating a call still -shows personal contacts, as consistent with the experience in Android 5.0. +Call Log now displays work contacts when the user views past calls. +Setting {@code DevicePolicyManager.setCrossProfileCallerIdDisabled()} to {@code true} hides the +work profile contacts in the Google Dialer Call Log. Work contacts can be displayed along with +personal contacts to devices over Bluetooth only if +you set {@code DevicePolicyManager.setBluetoothContactSharingDisabled()} to {@code false}. By +default, it is set to {@code true}. </li> <li><strong>WiFi configuration removal:</strong> WiFi configurations added by a Profile Owner (for example, through calls to the diff --git a/docs/html/preview/data-binding/guide.jd b/docs/html/preview/data-binding/guide.jd deleted file mode 100644 index 49b690f..0000000 --- a/docs/html/preview/data-binding/guide.jd +++ /dev/null @@ -1,908 +0,0 @@ -page.title=Data Binding Guide - -@jd:body -<p>Data Binding allows you write declarative layouts and minimize the glue code -that is necessary to bind your application logic and layouts.</p> - - -<h2 id=build_environment>Build Environment</h2> - - -<p><strong>Setting Up Work Environment:</strong></p> - -<p>Data Binding EAP only supports gradle.</p> - -<p>To set up your application, unzip the provided bundle to a location. It has 3 -sections</p> - -<ul> - <li> <em>maven-repo:</em> which keeps the data-binding libraries - <li> <em>samples:</em> Sample applications - <li> <em>databinding.properties:</em> Properties file that can be used to integrate with your app -</ul> - -<p>Add the following section to the project’s build.gradle file (not the module's -build.gradle) and replace <code><BUNDLE_FOLDER> </code>with the absolute path of the bundle that you’ve unzipped in the previous step.</p> - -<pre class=prettyprint> -buildscript { - <strong>def </strong>eapFolder = '<BUNDLE_FOLDER>' -<strong> def </strong>Properties props = <strong>new </strong>Properties() - props.load(<strong>new </strong>FileInputStream(<strong>"</strong>${eapFolder}<strong>/databinding.properties"</strong>)) - props.mavenRepoDir = <strong>"</strong>${eapFolder}<strong>/</strong>${props.mavenRepoName}<strong>" - </strong>ext.config = props - repositories { - jcenter() - maven { - url config.mavenRepoDir - } - } - dependencies { - classpath <strong>"com.android.tools.build:gradle:1.1.3" - </strong>classpath <strong>"com.android.databinding:dataBinder:</strong>${config.snapshotVersion}<strong>" -<em></strong> </em>} -} -allprojects { - repositories { - jcenter() - maven { - url config.mavenRepoDir - } - } -} -</pre> - -<p>Next, add the following lines to the <em>build.gradle</em> -file of each module that will use data-binding. The application module must -have this, even if only its libraries use data binding.</p> - -<pre class=prettyprint> -apply plugin: <strong>'com.android.databinding' -</strong>dependencies { - compile <strong>"com.android.databinding:library:</strong>${config.snapshotVersion}<strong>" -</strong> compile <strong>"com.android.databinding:baseLibrary:</strong>${config.snapshotVersion}<strong>" -</strong> compile <strong>"com.android.databinding:adapters:</strong>${config.snapshotVersion}<strong>" -</strong> provided <strong>"com.android.databinding:annotationprocessor:</strong>${config.snapshotVersion}<strong>" -</strong>} -</pre> - - -<h2 id="data_binding_layout_files">Data Binding Layout Files</h2> - - -<h3 id="writing_expressions">Writing your first data binding expressions:</h3> - -<p>Data-binding layout files are slightly different and start with a root tag of -<strong>layout</strong> followed by a <strong>data</strong> element and a -<strong>view</strong> root element. This view element is what your root would -be in a non-binding layout file.A sample file looks like this:</p> - -<pre class=prettyprint> -<em><?<strong></em>xml version="1.0" encoding="utf-8"<em></strong>?> -</em><<strong>layout xmlns:android="http://schemas.android.com/apk/res/android"</strong>> - <<strong>data</strong>> - <<strong>variable name="user" type="com.example.User"</strong>/> - </<strong>data</strong>> - <<strong>LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"</strong>> - <<strong>TextView android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@{user.firstName}"</strong>/> - <<strong>TextView android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@{user.lastName}"</strong>/> - </<strong>LinearLayout</strong>> -</<strong>layout</strong>> -</pre> - -<p>The user <strong>variable</strong> within <strong>data</strong> describes a property that may be used within this layout.</p> - -<pre class=prettyprint> -<<strong>variable name="user" type="com.example.User"</strong>/> -</pre> - -<p>Expressions within the layout are written in the attribute properties using the -“<code>@{}</code>” syntax. Here, the TextView’s text is set to the firstName property of user:</p> -<pre class=prettyprint> -<<strong>TextView android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@{user.firstName}"</strong>/> -</pre> - - -<h3 id="data_object">Data Object</h3> - -<p>Let’s assume for now that you have a plain-old Java object (POJO) for User:</p> -<pre class=prettyprint> -<strong>public class </strong>User { - <strong>public final </strong>String <strong>firstName</strong>; - <strong>public final </strong>String <strong>lastName</strong>; - <strong>public </strong>User(String firstName, String lastName) { - <strong>this</strong>.<strong>firstName </strong>= firstName; - <strong>this</strong>.<strong>lastName </strong>= lastName; - } -} -</pre> - -<p>This type of object has data that never changes. It is common in applications -to have data that is read once and never changes thereafter. It is also -possible to use a JavaBeans objects:</p> -<pre class=prettyprint> -<strong>public class </strong>User { - <strong>private final </strong>String <strong>firstName</strong>; - <strong>private final </strong>String <strong>lastName</strong>; - <strong>public </strong>User(String firstName, String lastName) { - <strong>this</strong>.<strong>firstName </strong>= firstName; - <strong>this</strong>.<strong>lastName </strong>= lastName; - } - <strong>public </strong>String getFirstName() { - <strong>return this</strong>.<strong>firstName</strong>; - } - <strong>public </strong>String getLastName() { - <strong>return this</strong>.<strong>lastName</strong>; - } -} -</pre> - -<p>From the perspective of data binding, these two classes are equivalent. The -expression <strong><code>@{user.lastName}</code></strong> used for the TextView’s <strong><code>android:text</code></strong> attribute will access the <strong><code>firstName</code></strong> field in the former class and the <code>getFirstName()</code> method in the latter class. -</p><h3 id=binding_data>Binding Data</h3> - -<p>By default, a Binding class will be generated based on the name of the layout -file, converting it to Pascal case and suffixing “Binding” to it. The above -layout file was <code>activity_main.xml</code> so the generate class was <code>ActivityMainBinding</code>. This class holds all the bindings from the layout properties (e.g. the <code>user</code> variable) to the layout’s Views and knows how to assign values for the binding -expressions.The easiest means for creating the bindings is to do it while inflating: -</p> - -<pre class=prettyprint> -@Override -<strong>protected void </strong>onCreate(Bundle savedInstanceState) { - <strong>super</strong>.onCreate(savedInstanceState); - ActivityMainBinding binding = DataBindingUtil.<em>setContentView</em>(<strong>this</strong>, R.layout.<em><strong>main_activity</strong></em>); - User user = <strong>new </strong>User(<strong>"Test"</strong>, <strong>"User"</strong>); - binding.setUser(user); -} -</pre> - -<p>You’re done! Run the application and you’ll see Test User in the UI.Alternatively, you can get the view via: -</p><pre class=prettyprint> -MainActivityBinding binding = MainActivityBinding.<em>inflate</em>(getLayoutInflater()); -</pre> - -<p>If you are using data binding items inside a ListView or RecyclerView adapter, -you may prefer to use: -</p><pre class=prettyprint> -ListItemBinding binding = ListItemBinding.inflate(layoutInflater, viewGroup, -false); -//or -ListItemBinding binding = DataBindingUtil.<em>inflate</em>(layoutInflater, R.layout.<em><strong>list_item</strong></em>, viewGroup, <strong>false</strong>); -</pre> - - -<h2 id=layout_details>Layout Details</h2> - - -<h3 id=imports>Imports</h3> - -<p>Zero or more <strong><code>import</code></strong> elements may be used inside the <strong><code>data</code></strong> element. These allow easy reference to classes inside your layout file, just -like in Java. -</p><pre class=prettyprint> -<<strong>data</strong>> - <<strong>import type="android.view.View"</strong>/> -</<strong>data</strong>> -</pre> - -<p>Now, View may be used within your binding expression: -</p><pre class=prettyprint> -<<strong>TextView - android:text="@{user.lastName}" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:visibility="@{user.isAdult ? View.VISIBLE : View.GONE}"</strong>/> -</pre> - -<p>When there are class name conflicts, one of the classes may be renamed to an -“alias:”</p> -<pre class=prettyprint> -<<strong>import type="android.view.View"</strong>/> -<<strong>import type="com.example.real.estate.View" - alias="Vista"</strong>/> -</pre> - -<p>Now, <strong><code>Vista</code></strong> may be used to reference the <code>com.example.real.estate.View</code> and <strong><code>View</code></strong> may be used to reference <code>android.view.View </code>within the layout file.Imported types may be used as type references in variables and expressions:</p> -<pre class=prettyprint> -<<strong>data</strong>> - <<strong>import type="com.example.User"</strong>/> - <<strong>import type="java.util.List"</strong>/> - <<strong>variable name="user" type="User"</strong>/> - <<strong>variable name="userList" type="List<User>"</strong>/> -</<strong>data</strong>> -… -<<strong>TextView - android:text="@{((User)(user.connection)).lastName}" - android:layout_width="wrap_content" - android:layout_height="wrap_content"</strong>/> -</pre> - -<p>Imported types may also be used when referencing static fields and methods in -expressions:</p> -<pre class=prettyprint> -<<strong>data</strong>> - <<strong>import type="com.example.MyStringUtils"</strong>/> - <<strong>variable name="user" type="com.example.User"</strong>/> -</<strong>data</strong>> -… -<<strong>TextView - android:text="@{MyStringUtils.capitalize(user.lastName)}" - android:layout_width="wrap_content" - android:layout_height="wrap_content"</strong>/> -</pre> - -<p>Just as in Java, <code>java.lang.*</code> is imported automatically.</p> -<h3 id=variables>Variables</h3> - -<p>Any number of <strong><code>variable</code></strong> elements may be used inside the <strong><code>data</code></strong> element. Each <strong><code>variable</code></strong> element describes a property that may be set on the layout to be used in -binding expressions within the layout file.</p> -<pre class=prettyprint> -<<strong>data</strong>> - <<strong>import type="android.graphics.drawable.Drawable"</strong>/> - <<strong>variable name="user" type="com.example.User"</strong>/> - <<strong>variable name="image" type="Drawable"</strong>/> - <<strong>variable name="note" type="String"</strong>/> -</<strong>data</strong>> -</pre> - -<p>The variable types are inspected at compile time, so if a variable implements <a href="#observable_objects">Observable</a>, <a href="#observable_collections">observable collection</a>, that should be reflected in the type. If the variable is a base class or - interface that does not implement the Observable* interface, the variables will <strong>not be</strong> observed!</p> - -<p>When there are different layout files for various configurations (e.g. -landscape or portrait), the variables will be combined. There must not be -conflicting variable definitions between these layout files.</p> - -<p>The generated binding class will have a setter and getter for each of the -described variables. The variables will take the default Java values until the -setter is called — <code>null</code> for reference types, <code>0</code> for <code>int</code>, <code>false</code> for <code>boolean</code>, etc.</p> - -<h3 id=custom_binding_class_names>Custom Binding Class Names</h3> - -<p>By default, a Binding class is generated based on the name of the layout file, -starting it with upper-case, removing underscores ( _ ) and capitalizing the -following letter and then suffixing “Binding”. This class will be placed in a -databinding package under the module package. For example, the layout file <code>contact_item.xml</code> will generate <code>ContactItemBinding</code>. If the module package is <code>com.example.my.app</code>, then it will be placed in <code>com.example.my.app.databinding</code>.</p> - -<p>Binding classes may be renamed or placed in different packages by adjusting the <strong><code>class</code></strong> attribute of the <strong><code>data</code></strong> element. For example:</p> -<pre class=prettyprint> -<<strong>data class="ContactItem"</strong>> - ... -</<strong>data</strong>> -</pre> - -<p>This generates the binding class as <code>ContactItem</code> in the databinding package in the module package. If the class should be -generated in a different package within the module package, it may be prefixed -with “.”:</p> -<pre class=prettyprint> -<<strong>data class=".ContactItem"</strong>> - ... -</<strong>data</strong>> -</pre> - -In this case, <code>ContactItem</code> is generated in the module package directly.Any package may be used if the full package is provided: -<pre class=prettyprint> -<<strong>data class="com.example.ContactItem"</strong>> - ... -</<strong>data</strong>> -</pre> - - -<h3 id=includes>Includes</h3> - -<p>Variables may be passed into an included layout's binding from the containing -layout by using the application namespace and the variable name in an -attribute:</p> -<pre class=prettyprint> -<em><?<strong></em>xml version="1.0" encoding="utf-8"<em></strong>?> -</em><<strong>layout xmlns:android="http://schemas.android.com/apk/res/android" -</strong> <strong> xmlns:bind="http://schemas.android.com/apk/res-auto"</strong>> - <<strong>data</strong>> - <<strong>variable name="user" type="com.example.User"</strong>/> - </<strong>data</strong>> - <<strong>LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"</strong>> - <<strong>include layout="@layout/name" - bind:user="@{user}"</strong>/> - <<strong>include layout="@layout/contact" - bind:user="@{user}"</strong>/> - </<strong>LinearLayout</strong>> -</<strong>layout</strong>> -</pre> - -<p>Here, there must be a <code>user</code> variable in both the <code>name.xml </code>and <code>contact.xml </code>layout files.</p> -<h3 id=expression_language>Expression Language</h3> - - -<h4 id=common_features>Common Features</h4> - -<p>The expression language looks a lot like a Java expression. These are the same:</p> -<ul> - <li> Mathematical <strong><code>+ - / * %</code></strong> - <li> String concatenation <strong><code>+</code></strong> - <li> <code>L</code>ogical <strong><code>&& ||</code></strong> - <li> Binary <strong><code>&</code> <code>|</code> <code>^</code></strong> - <li> Unary <strong><code>+ - ! ~</code></strong> - <li> Shift <strong><code>>> >>> <<</code></strong> - <li> Comparison <strong><code>== > < >= <=</code></strong> - <li> <strong><code>instanceof</code></strong> - <li> Grouping <strong><code>()</code></strong> - <li> Literals - character, String, numeric, <strong><code>null</code></strong> - <li> Cast - <li> Method calls - <li> Field access - <li> Array access <strong><code>[]</code></strong> - <li> Ternary operator <strong><code>?:</code></strong> -</ul> -<p>Examples:</p> -<pre class=prettyprint> -<strong>android:text="@{String.valueOf(index + 1)}" -android:visibility="@{age < 13 ? View.GONE : View.VISIBLE}" -android:transitionName='@{"image_" + id}'</strong> -</pre> - - -<h4 id=missing_operations>Missing Operations</h4> - -<p>A few operations are missing from the expression syntax that you can use in -Java.</p> -<ul> - <li> <strong><code>this</code></strong> - <li> <strong><code>super</code></strong> - <li> <strong><code>new</code></strong> - <li> Explicit generic invocation -</ul> - -<h4 id=null_coalescing_operator>Null Coalescing Operator</h4> - -<p>The null coalescing operator (<strong><code>??</code></strong>) chooses the left operand if it is not null or the right if it is null.</p> -<pre class=prettyprint> -<strong>android:text="@{user.displayName ?? user.lastName}"</strong> -</pre> - -<p>This is functionally equivalent to:</p> -<pre class=prettyprint> -<strong>android:text="@{user.displayName != null ? user.displayName : user.lastName}"</strong> -</pre> - - -<h4 id=property_reference>Property Reference</h4> - -<p>The first was already discussed in the <a href="#writing_your_first_data_binding_expressions">Writing your first data binding expressions</a> above: short form JavaBean references. When an expression references a -property on a class, it uses the same format for fields, getters, and -ObservableFields.</p> -<pre class=prettyprint> -<strong>android:text="@{user.lastName}"</strong> -</pre> - - -<h4 id=collections>Collections</h4> - -<p>Common collections: arrays, lists, sparse lists, and maps, may be accessed -using the <code>[]</code> operator for convenience.</p> -<pre class=prettyprint> -<<strong>data</strong>> - <<strong>import type="android.util.SparseArray"</strong>/> - <<strong>import type="java.util.Map"</strong>/> - <<strong>import type="java.util.List"</strong>/> - <<strong>variable name="list" type="List<String>"</strong>/> - <<strong>variable name="sparse" type="SparseArray<String>"</strong>/> - <<strong>variable name="map" type="Map<String, String>"</strong>/> - <<strong>variable name="index" type="int"</strong>/> - <<strong>variable name="key" type="String"</strong>/> -</<strong>data</strong>> -… -<strong>android:text="@{list[index]}" -</strong>… -<strong>android:text="@{sparse[index]}" -</strong>… -<strong>android:text="@{map[key]}" -</strong> -</pre> - - -<h4 id=string_literals>String Literals</h4> - -<p>When using single quotes around the attribute value, it is easy to use double -quotes in the expression:</p> -<pre class=prettyprint> -<strong>android:text='@{map["firstName"]}'</strong> -</pre> - -<p>It is also possible to use double quotes to surround the attribute value. When -doing so, String literals should either use the " or back quote (`).</p> -<pre class=prettyprint> -<strong>android:text="@{map[`firstName`}" -android:text="@{map["firstName"]}"</strong> -</pre> - - -<h4 id=resources>Resources</h4> - -<p>It is possible to access resources as part of expressions using the normal -syntax:</p> -<pre class=prettyprint> -<strong>android:padding="@{large? @dimen/largePadding : @dimen/smallPadding}"</strong> -</pre> - -<p>Format strings and plurals may be evaluated by providing parameters:</p> -<pre class=prettyprint> -<strong>android:text="@{@string/nameFormat(firstName, lastName)}" -android:text="@{@plurals/banana(bananaCount)}"</strong> -</pre> - -<p>Some resources require explicit type evaluation.</p> - -<table> - <tr> - <th>Type</th> - <th>Normal Reference</th> - <th>Expression Reference</th> - </tr> - <tr> - <td> -<pre class=prettyprint> -String[]</td> - <td> -@array</td> - <td> -@stringArray</td> - </tr> - <tr> - <td> -int[]</td> - <td> -@array</td> - <td> -@intArray</td> - </tr> - <tr> - <td> -TypedArray</td> - <td> -@array</td> - <td> -@typedArray</td> - </tr> - <tr> - <td> -Animator</td> - <td> -@animator</td> - <td> -@animator</td> - </tr> - <tr> - <td> -StateListAnimator</td> - <td> -@animator</td> - <td> -@stateListAnimator</td> - </tr> - <tr> - <td> -</pre> - -color <code>int</code></td> - <td> -<pre class=prettyprint> -@color</td> - <td> -@color</td> - </tr> - <tr> - <td> -ColorStateList</td> - <td> -@color</td> - <td> -@colorStateList</td> - </tr> -</table> - -</pre> - - -<h2 id="data_objects">Data Objects</h2> - - -<p>Any plain old Java object (POJO) may be used for data binding, but modifying a -POJO will not cause the UI to update. The real power of data binding can be -used by giving your data objects the ability to notify when data changes. There -are three different data change notification mechanisms, <code>Observable </code>objects, <code>ObservableField</code>s, and <code>observable collections</code>.</p> - -<p>When one of these observable data object is bound to the UI and a property of -the data object changes, the UI will be updated automatically.</p> - -<h3 id=observable_objects>Observable Objects</h3> - - -<p>A class implementing <code>android.databinding.Observable</code> interface will allow the binding to attach a single listener to a bound object -to listen for changes of all properties on that object.</p> - -<p>The <code>Observable</code> interface has a mechanism to add and remove listeners, but notifying is up to -the developer. To make development easier, a base class, <code>BaseObservable,</code> was created to implement the listener registration mechanism. The data class -implementer is still responsible for notifying when the properties change. This -is done by assigning an <code>Bindable </code>annotation to the getter and notifying in the setter.</p> - -<pre class=prettyprint> -<strong>private static class </strong>User <strong>extends </strong>BaseObservable { - <strong>private </strong>String <strong>firstName</strong>; - <strong>private </strong>String <strong>lastName</strong>; - @Bindable - <strong>public </strong>String getFirstName() { - <strong>return this</strong>.<strong>firstName</strong>; - } - @Bindable - <strong>public </strong>String getFirstName() { - <strong>return this</strong>.<strong>lastName</strong>; - } - <strong>public void </strong>setFirstName(String firstName) { - <strong>this</strong>.<strong>firstName </strong>= firstName; - notifyPropertyChanged(BR.firstName); - } - <strong>public void </strong>setLastName(String lastName) { - <strong>this</strong>.<strong>lastName </strong>= lastName; - notifyPropertyChanged(BR.lastName); - } -} -</pre> - -<p>The <code>Bindable </code>annotation generates an entry in the BR class file during compilation. The BR -class file will be generated in the module package.If the base class for data classes cannot be changed, the <code>Observable</code> interface may be implemented using the convenient <code>PropertyChangeRegistry</code> to store and notify listeners efficiently.</p> - -<h3 id=observablefields>ObservableFields</h3> - -<p>A little work is involved in creating Observable classes, so developers who -want to save time or have few properties may use ObservableFields. -ObservableFields are self-contained observable objects that have a single -field. There are versions for all primitive types and one for reference types. -To use, create a public final field in the data class:</p> -<pre class=prettyprint> -<strong>private static class </strong>User <strong>extends </strong>BaseObservable { - <strong>public final </strong>ObservableField<String> <strong>firstName </strong>= - <strong>new </strong>ObservableField<>(); - <strong>public final </strong>ObservableField<String> <strong>lastName </strong>= - <strong>new </strong>ObservableField<>(); - <strong>public final </strong>ObservableInt <strong>age </strong>= <strong>new </strong>ObservableInt(); -} -</pre> - -<p>That's it! To access the value, use the set and get accessor methods:</p> -<pre class=prettyprint> -user.<strong>firstName</strong>.set(<strong>"Google"</strong>); -<strong>int </strong>age = user.<strong>age</strong>.get(); -</pre> - - -<h3 id=observable_collections>Observable Collections</h3> - -<p>Some applications use more dynamic structures to hold data. Observable - collections allow keyed access to these data objects.ObservableArrayMap is useful when the key is a reference type, such as String.</p> - -<pre class=prettyprint> -ObservableArrayMap<String, Object> user = <strong>new </strong>ObservableArrayMap<>(); -user.put(<strong>"firstName"</strong>, <strong>"Google"</strong>); -user.put(<strong>"lastName"</strong>, <strong>"Inc."</strong>); -user.put(<strong>"age"</strong>, 17); -</pre> - -In the layout, the map may be accessed through the String keys: -<pre class=prettyprint> -<<strong>data</strong>> - <<strong>import type="android.databinding.ObservableMap"</strong>/> - <<strong>variable name="user" type="ObservableMap<String, Object>"</strong>/> -</<strong>data</strong>> -… -<<strong>TextView - android:text='@{user["lastName"]}' - android:layout_width="wrap_content" - android:layout_height="wrap_content"</strong>/> -<<strong>TextView - android:text='@{String.valueOf(1 + (Integer)user["age"])}' - android:layout_width="wrap_content" - android:layout_height="wrap_content"</strong>/> -</pre> - -<p>ObservableArrayList is useful when the key is an integer:</p> -<pre class=prettyprint> -ObservableArrayList<Object> user = <strong>new </strong>ObservableArrayList<>(); -user.add(<strong>"Google"</strong>); -user.add(<strong>"Inc."</strong>); -user.add(17); -</pre> - -<p>In the layout, the list may be accessed through the indices:</p> -<pre class=prettyprint> -<<strong>data</strong>> - <<strong>import type="android.databinding.ObservableList"</strong>/> - <<strong>import type="com.example.my.app.Fields"</strong>/> - <<strong>variable name="user" type="ObservableList<Object>"</strong>/> -</<strong>data</strong>> -… -<<strong>TextView - android:text='@{user[Fields.LAST_NAME]}' - android:layout_width="wrap_content" - android:layout_height="wrap_content"</strong>/> -<<strong>TextView - android:text='@{String.valueOf(1 + (Integer)user[Fields.AGE])}' - android:layout_width="wrap_content" - android:layout_height="wrap_content"</strong>/> -</pre> - - -<h2 id=generated_binding>Generated Binding</h2> - -<p>The generated binding class links the layout variables with the Views within -the layout. As discussed earlier, the name and package of the Binding may be <a href="#custom_binding_class_names">customized</a>. The Generated binding classes all extend <code>android.databinding.ViewDataBinding</code>.</p> -<h3 id=creating>Creating</h3> - -<p>The binding should be created soon after inflation to ensure that the View -hierarchy is not disturbed prior to binding to the Views with expressions -within the layout. There are a few ways to bind to a layout. The most common is -to use the static methods on the Binding class.The inflate method inflates the View hierarchy and binds to it all it one step. -There are versions that attach the View to its parent and that inflate without -attaching.</p> -<pre class=prettyprint> -MyLayoutBinding binding = MyLayoutBinding.<em>inflate</em>(<strong>this</strong>); -MyLayoutBinding binding = MyLayoutBinding.<em>inflate</em>(viewGroup); -</pre> - -<p>If the layout was inflated using a different mechanism, it may be bound -separately:</p> -<pre class=prettyprint> -MyLayoutBinding binding = MyLayoutBinding.<em>bind</em>(viewRoot); -</pre> - -<p>Sometimes the binding cannot be known in advance. In such cases, the binding -can be created using the DataBindingUtil class:</p> -<pre class=prettyprint> -ViewDataBinding binding = DataBindingUtil.<em>inflate</em>(context, layoutId, - parent, attachToParent); -ViewDataBinding binding = DataBindingUtil.<em>bindTo</em>(viewRoot, layoutId); -</pre> - - -<h3 id=views_with_ids>Views With IDs</h3> - -<p>A public final field will be generated for each View with an ID in the layout. -The binding does a single pass on the View hierarchy, extracting the Views with -IDs. This mechanism can be faster than calling findViewById for several Views. For example:</p> -<pre class=prettyprint> -<<strong>layout xmlns:android="http://schemas.android.com/apk/res/android"</strong>> - <<strong>data</strong>> - <<strong>variable name="user" type="com.example.User"</strong>/> - </<strong>data</strong>> - <<strong>LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"</strong>> - <<strong>TextView android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@{user.firstName}" -</strong> <strong>android:id="@+id/firstName"</strong>/> - <<strong>TextView android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@{user.lastName}"</strong> <strong>android:id="@+id/lastName"</strong>/> - </<strong>LinearLayout</strong>> -</<strong>layout</strong>> -</pre> - -Will generate a binding class with: -<pre class=prettyprint> -<strong>public final </strong>TextView <strong>firstName</strong>; -<strong>public final </strong>TextView <strong>lastName</strong>; -</pre> - -<p>IDs are not nearly as necessary as without data binding, but there are still -some instances where access to Views are still necessary from code.</p> -<h3 id=variables>Variables</h3> - -<p>Each variable will be given a accessor methods.</p> -<pre class=prettyprint> -<<strong>data</strong>> - <<strong>import type="android.graphics.drawable.Drawable"</strong>/> - <<strong>variable name="user" type="com.example.User"</strong>/> - <<strong>variable name="image" type="Drawable"</strong>/> - <<strong>variable name="note" type="String"</strong>/> -</<strong>data</strong>> -</pre> - -<p>will generate setters and getters in the binding:</p> -<pre class=prettyprint> -<strong>public abstract </strong>com.example.User getUser(); -<strong>public abstract void </strong>setUser(com.example.User user); -<strong>public abstract </strong>Drawable getImage(); -<strong>public abstract void </strong>setImage(Drawable image); -<strong>public abstract </strong>String getNote(); -<strong>public abstract void </strong>setNote(String note); -</pre> - - -<h3 id=viewstubs>ViewStubs</h3> - -<p>ViewStubs are a little different from normal Views. They start off invisible -and when they either are made visible or are explicitly told to inflate, they -replace themselves in the layout by inflating another layout.</p> - -<p>Because the ViewStub essentially disappears from the View hierarchy, the View -in the binding object must also disappear to allow collection. Because the -Views are final, a ViewStubProxy object takes the place of the ViewStub, giving -the developer access to the ViewStub when it exists and also access to the -inflated View hierarchy when the ViewStub has been inflated.</p> - -<p>When inflating another layout, a binding must be established for the new -layout. Therefore, the ViewStubProxy must listen to the ViewStub's -OnInflateListener and establish the binding at that time. Since only one can -exist, the ViewStubProxy allows the developer to set an OnInflateListener on it -that it will call after establishing the binding.</p> - -<h3 id=advanced_binding>Advanced Binding</h3> - - -<h4 id=dynamic_variables>Dynamic Variables</h4> - -<p>At times, the specific binding class won't be known. For example, a -RecyclerView Adapter operating against arbitrary layouts won't know the -specific binding class. It still must assign the binding value during the -onBindViewHolder.</p> - -<p>In this example, all layouts that the RecyclerView binds to have an "item" -variable. The BindingHolder has a getBinding method returning the <code>ViewDataBinding</code> base.</p> -<pre class=prettyprint> -<strong>public void </strong>onBindViewHolder(BindingHolder holder, <strong>int </strong>position) { - <strong>final </strong>T item = <strong>mItems</strong>.get(position); - holder.getBinding().setVariable(BR.item, item); - holder.getBinding().executePendingBindings(); -} -</pre> - - -<h4 id=immediate_binding>Immediate Binding</h4> - -<p>When a variable or observable changes, the binding will be scheduled to change -before the next frame. There are times, however, when binding must be executed -immediately. To force execution, use the executePendingBindings() method.</p> -<h2 id=attribute_setters>Attribute Setters</h2> - -<p>Whenever a bound value changes, the generated binding class must call a setter -method on the View with the binding expression. The data binding framework has -ways to customize which method to call to set the value.</p> -<h3 id=automatic_setters>Automatic Setters</h3> - -For an attribute, data binding tries to find the method setAttribute. The -namespace for the attribute does not matter, only the attribute name itself. - -<p>For example, an expression associated with TextView's attribute <strong><code>android:text</code></strong> will look for a setText(String). If the expression returns an int, data -binding will search for a setText(int) method. Be careful to have the -expression return the correct type, casting if necessary.Note that data binding will work even if no attribute exists with the given -name. You can then easily "create" attributes for any setter by using data -binding. For example, support DrawerLayout doesn't have any attributes, but -plenty of setters. You can use the automatic setters to use one of these.</p> -<pre class=prettyprint> -<android.support.v4.widget.<strong>DrawerLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:scrimColor="@{@color/scrim}" - app:drawerListener="@{fragment.drawerListener}"/></strong> -</pre> - - -<h3 id=renamed_setters>Renamed Setters</h3> - -<p>Some attributes have setters that don't match by name. For these methods, an -attribute may be associated with the setter through BindingMethods annotation. -This must be associated with a class and contains BindingMethod annotations, -one for each renamed method. For example, the <strong><code>android:tint</code></strong> attribute is really associated with setImageTintList, not setTint.</p> -<pre class=prettyprint> -@BindingMethods({ - @BindingMethod(type = <strong>"android.widget.ImageView"</strong>, - attribute = <strong>"android:tint"</strong>, - method = <strong>"setImageTintList"</strong>), -}) -</pre> - -<p>It is unlikely that developers will need to rename setters; the android -framework attributes have already been implemented.</p> -<h3 id=custom_setters>Custom Setters</h3> - -<p>Some attributes need custom binding logic. For example, there is no associated -setter for the <strong><code>android:paddingLeft</code></strong> attribute. Instead, setPadding(left, top, right, bottom) exists. A static -binding adapter method with the BindingAdapter annotation allows the developer -to customize how a setter for an attribute is called.</p> - -<p>The android attributes have already had BindingAdapters created. For example, -here is the one for paddingLeft:</p> -<pre class=prettyprint></p> -@BindingAdapter(<strong>"android:paddingLeft"</strong>) -<strong>public static void </strong>setPaddingLeft(View view, <strong>int </strong>padding) { - view.setPadding(padding, - view.getPaddingTop(), - view.getPaddingRight(), - view.getPaddingBottom()); -} -</pre> - -<p>Binding adapters are useful for other types of customization. For example, a - custom loader can be called off-thread to load an image.</p> - -<p>Developer-created binding adapters will override the data binding default -adapters when there is a conflict.</p> - -<p>You can also have adapters that receive multiple parameters. </p> -<pre class=prettyprint> -@BindingAdapter(attributes = {<strong>"bind:imageUrl"</strong>, <strong>"bind:error"</strong>}) -<strong>public static void </strong>loadImage(ImageView view, String url, Drawable error) { - Picasso.<em>with</em>(view.getContext()).load(url).error(error).into(view); -} -</pre> - -<p>This adapter will be called if both <strong>imageUrl </strong>and <strong>error </strong>are used for an ImageView and <em>imageUrl </em>is a string and <em>error</em> is a drawable.</p> -<ul> - <li> Custom namespaces are ignore during matching. - <li> You can also write adapters for android namespace. -</ul> - -<pre class=prettyprint> -<ImageView app:imageUrl=“@{venue.imageUrl}” -app:error=“@{@drawable/venueError}”/> -</pre> - - -<h2 id=converters>Converters</h2> - - -<h3 id=object_conversions>Object Conversions</h3> - -<p>When an Object is returned from a binding expression, a setter will be chosen -from the automatic, renamed, and custom setters. The Object will be cast to a -parameter type of the chosen setter.</p><p>This is a convenience for those using ObservableMaps to hold data. for example:</p> -<pre class=prettyprint> -<<strong>TextView - android:text='@{userMap["lastName"]}' - android:layout_width="wrap_content" - android:layout_height="wrap_content"</strong>/> -</pre> - -<p>The userMap returns an Object and that Object will be automatically cast to -parameter type found in the setter <code>setText(CharSequence)</code>. When there may be confusion about the parameter type, the developer will need -to cast in the expression.</p> -<h3 id=custom_conversions>Custom Conversions</h3> - -<p>Sometimes conversions should be automatic between specific types. For example, -when setting the background:</p> -<pre class=prettyprint> -<<strong>View - android:background="@{isError ? @color/red : @color/white}" - android:layout_width="wrap_content" - android:layout_height="wrap_content"</strong>/> -</pre> - -<p>Here, the background takes a <code>Drawable</code>, but the color is an integer. Whenever a <code>Drawable</code> is expected and an integer is returned, the <code>int</code> should be converted to a <code>ColorDrawable</code>. This conversion is done using a static method with a BindingConversion -annotation:</p> -<pre class=prettyprint> -@BindingConversion -<strong>public static </strong>ColorDrawable convertColorToDrawable(<strong>int </strong>color) { - <strong>return new </strong>ColorDrawable(color); -} -</pre> - -<p>Note that conversions only happen at the setter level, so it is <strong>not allowed </strong>to mix types like this:</p> -<pre class=prettyprint> -<<strong>View - android:background="@{isError ? @drawable/error : @color/white}" - android:layout_width="wrap_content" - android:layout_height="wrap_content"</strong>/> -</pre> - diff --git a/docs/html/preview/download.jd b/docs/html/preview/download.jd index 8a67a9a..448a23d 100644 --- a/docs/html/preview/download.jd +++ b/docs/html/preview/download.jd @@ -189,7 +189,7 @@ This is the Android SDK Preview License Agreement (the “License Agreement”). </p> -<h2 id="#docs">Developer Documentation</h2> +<h2 id="docs">Developer Documentation</h2> <p> The developer documentation download package provides detailed API reference information and an API difference report for the preview. @@ -203,9 +203,9 @@ This is the Android SDK Preview License Agreement (the “License Agreement”). <tr id="docs-dl"> <td>Android M Preview<br>Developer Docs</td> <td><a href="#top" onclick="onDownload(this)" - >m-preview-devdocs-r1.zip</a><br> - MD5: 5a6ae77217978cb7b958a240c2e80b57<br> - SHA-1: ac1d8a8e4f4a1dca5864dc733caa940bffc28616 + >m-preview-1-developer-docs.zip</a><br> + MD5: b65201b0d35416f5a1b7a071b52854a7<br> + SHA-1: d47e856aa65e06897e6edd902ad8d2b1f05ac3ec </td> </tr> <table> @@ -214,7 +214,7 @@ This is the Android SDK Preview License Agreement (the “License Agreement”). <h2 id="images">Hardware System Images</h2> <p> - These system images allow you install a preview version of the platform on a physical device for + These system images allow you to install a preview version of the platform on a physical device for testing. By configuring a device with one of these images, you can install and test your app to see how it performs on the next version of the platform. The process of installing a system image on a device <em>removes all data from the device</em>, so you should backup your data before @@ -238,33 +238,33 @@ This is the Android SDK Preview License Agreement (the “License Agreement”). <tr id="hammerhead"> <td>Nexus 5 (GSM/LTE) <br>"hammerhead"</td> <td><a href="#top" onclick="onDownload(this)" - >hammerhead-mpv79-preview-ac1d8a8e.tgz</a><br> - MD5: 5a6ae77217978cb7b958a240c2e80b57<br> - SHA-1: ac1d8a8e4f4a1dca5864dc733caa940bffc28616 + >hammerhead-MPZ44Q-preview-55d76d3a.tgz</a><br> + MD5: 9e2631b06c6525e401ceaae3677ff320<br> + SHA-1: 55d76d3a379b18f3363f28d8a462c236ab96fc36 </td> </tr> <tr id="shamu"> <td>Nexus 6 <br>"shamu"</td> <td><a href="#top" onclick="onDownload(this)" - >shamu-mpv79-preview-ac1d8a8e.tgz</a><br> - MD5: 5a6ae77217978cb7b958a240c2e80b57<br> - SHA-1: ac1d8a8e4f4a1dca5864dc733caa940bffc28616 + >shamu-MPZ44Q-preview-c1d6506a.tgz</a><br> + MD5: 307cbf9dab0a38df4ab2639d02be12aa<br> + SHA-1: c1d6506a74094bdb2f4b8677c7fe4967334f9ea8 </td> </tr> <tr id="volantis"> <td>Nexus 9 <br>"volantis"</td> <td><a href="#top" onclick="onDownload(this)" - >volantis-mpv79-preview-ac1d8a8e.tgz</a><br> - MD5: 5a6ae77217978cb7b958a240c2e80b57<br> - SHA-1: ac1d8a8e4f4a1dca5864dc733caa940bffc28616 + >volantis-MPZ44Q-preview-d15ad483.tgz</a><br> + MD5: 8989ce077510a1b814d58dcdb33d160e<br> + SHA-1: d15ad483d0364102984411abda66a4d7b85886c0 </td> </tr> <tr id="fugu"> <td>Nexus Player <br>"fugu"</td> <td><a href="#top" onclick="onDownload(this)" - >fugu-mpv79-preview-d0ddf8ce.tgz</a><br> - MD5: b293a5d3a4e07beabebcc0be85ad68a2<br> - SHA-1: d0ddf8ce733ba2a34279cdff8827fd604762c2342d + >fugu-MPZ44Q-preview-2406ba05.tgz</a><br> + MD5: 815902141a85cc65e7725f005cad31d5<br> + SHA-1: 2406ba0598dea1e69110497ac0bc8e16789bc8fb </td> </tr> </table> @@ -292,7 +292,7 @@ This is the Android SDK Preview License Agreement (the “License Agreement”). <h3 id="revertDevice">Revert a Device to Factory Specifications</h3> <p> - If you want to uninstall the Preview and revert the device to factory specifications, go to + If you want to uninstall the preview and revert the device to factory specifications, go to <a href="http://developers.google.com/android/nexus/images">developers.google.com/android</a> and download the image you want to flash to for your device. Follow the instructions on that page to flash the image to your device. @@ -305,7 +305,7 @@ This is the Android SDK Preview License Agreement (the “License Agreement”). <script> - var urlRoot = "http://storage.googleapis.com/androiddevelopers/preview/"; + var urlRoot = "http://storage.googleapis.com/androiddevelopers/shareables/preview/"; function onDownload(link) { $("#downloadForRealz").html("Download " + $(link).text()); @@ -330,15 +330,18 @@ This is the Android SDK Preview License Agreement (the “License Agreement”). function onDownloadForRealz(link) { if ($("input#agree").is(':checked')) { + /* $("#tos").fadeOut('fast'); $("#landing").fadeIn('fast'); + */ + ga('send', 'event', 'M Preview', 'System Image', $("#downloadForRealz").html()); + + /* location.hash = ""; + */ return true; } else { - $("label#agreeLabel").parent().stop().animate({color: "#258AAF"}, 200, - function() {$("label#agreeLabel").parent().stop().animate({color: "#222"}, 200)} - ); return false; } } diff --git a/docs/html/preview/features/app-linking.jd b/docs/html/preview/features/app-linking.jd index c516f35..5592323 100644 --- a/docs/html/preview/features/app-linking.jd +++ b/docs/html/preview/features/app-linking.jd @@ -1,8 +1,8 @@ -page.title=App Linking - +page.title=App Links +page.image=images/cards/card-app-linking_2x.png +page.keywords=applinking, deeplinks, intents @jd:body - <div id="qv-wrapper"> <div id="qv"> <h2>In this document</h2> @@ -17,12 +17,12 @@ page.title=App Linking <p> The Android Intent system is a flexible mechanism to enable apps to handle content and requests. Multiple apps may declare matching URI patterns in their intent filters. When a user clicks on a - web link that does not have default launch handler, the platform may show a dialog for the user + web link that does not have a default launch handler, the platform may show a dialog for the user to select from a list of apps that have declared matching intent filters. </p> <p> - The Android M Developer Preview introduces support for app linking, which improves upon existing + The Android M Developer Preview introduces support for App Links, which improves upon existing link handling by allowing app developers to associate an app with a web domain they own. When developers create this association, the platform can automatically determine the default app used to handle a particular web link and skip asking users. @@ -79,10 +79,11 @@ page.title=App Linking <h2 id="verfy-links">Request App Link Verification</h2> <p> - An app can indicate to the platform to verify app links against the {@code statements.json} files - hosted on the sites defined by the host names in the <data> elements of the intent filters. - To do this, add an {@code android:autoVerify} attribute to the appropriate intent filters in the - manifest, as shown in the following manifest code snippet: + An app can request that the platform automatically verify any app links defined by the host names + in the data elements of its intent filters against the {@code statements.json} files hosted on + the respective web domains. To request app link verification, add an {@code android:autoVerify} + attribute to each desired intent filter in the manifest, as shown in the following manifest code + snippet: </p> <pre> @@ -98,11 +99,21 @@ page.title=App Linking </pre> <p> - When an app is installed, the platform attempts to verify the app links. If the platform cannot - successfully verify app links, it falls back to prompting the user the next time they open a link - that the app handles, or they will need to explicitly enable the app in the App Info settings UI. + When the {@code android:autoVerify} attribute is present in an app manifest, the platform + attempts to verify app links when the app is installed. If the platform cannot successfully + verify the app links, the app is not set as the preferred app to handle the web links. The next + time a user opens one of the links, the platform falls back to presenting the user with a + dialog. +</p> + +<p class="note"> + <strong>Note:</strong> In testing, there is a potential for a false positive if verfication + fails, but the user has explicitly enabled the app to open supported links without asking, using + the system Settings app. In this case, no dialog is shown and the link goes directly to your + app, but only because of the user setting, and not because verification succeeded. </p> + <h2 id="user-manage">Managing App Link Settings</h2> <p> diff --git a/docs/html/preview/features/runtime-permissions.jd b/docs/html/preview/features/runtime-permissions.jd index 2ee44ef..fa7a12b 100644 --- a/docs/html/preview/features/runtime-permissions.jd +++ b/docs/html/preview/features/runtime-permissions.jd @@ -1,6 +1,7 @@ -page.title=Runtime Permissions +page.title=Permissions page.tags=previewresources, androidm page.keywords=permissions, runtime, preview +page.image=images/permissions_check.png @jd:body diff --git a/docs/html/preview/images/direct-share-screen.png b/docs/html/preview/images/direct-share-screen.png Binary files differindex 9e879e0..a53a33e 100644 --- a/docs/html/preview/images/direct-share-screen.png +++ b/docs/html/preview/images/direct-share-screen.png diff --git a/docs/html/preview/images/direct-share-screen_2x.png b/docs/html/preview/images/direct-share-screen_2x.png Binary files differindex 3bbfa7d..87816ff 100644 --- a/docs/html/preview/images/direct-share-screen_2x.png +++ b/docs/html/preview/images/direct-share-screen_2x.png diff --git a/docs/html/preview/images/fingerprint-screen.png b/docs/html/preview/images/fingerprint-screen.png Binary files differindex 0bb49ef..77f9982 100644 --- a/docs/html/preview/images/fingerprint-screen.png +++ b/docs/html/preview/images/fingerprint-screen.png diff --git a/docs/html/preview/images/fingerprint-screen_2x.png b/docs/html/preview/images/fingerprint-screen_2x.png Binary files differindex 25ce51a..4749bcf 100644 --- a/docs/html/preview/images/fingerprint-screen_2x.png +++ b/docs/html/preview/images/fingerprint-screen_2x.png diff --git a/docs/html/preview/index.jd b/docs/html/preview/index.jd index c5644cc..eb18aa6 100644 --- a/docs/html/preview/index.jd +++ b/docs/html/preview/index.jd @@ -1,6 +1,6 @@ page.title=Android M Developer Preview -page.tags="preview", -meta.tags="preview, M preview" +page.tags="preview", +meta.tags="preview, M preview", androidm fullpage=true section.landing=true header.hide=1 @@ -19,8 +19,8 @@ footer.hide=1 <h1 class="dac-hero-title">Android M Developer Preview</h1> <p class="dac-hero-description"> Get ready for the next version of Android. Test your apps on Nexus 5, 6, 9, and - Player. Explore what's new — a <strong>runtime permissions</strong> model, - power-saving <strong>Doze</strong> and <strong>Standby Mode</strong>, new + Player. Explore what's new — <strong>runtime permissions</strong>, + <strong>Doze</strong> and <strong>App Standby</strong> power-saving features, new <strong>assist technology</strong>, and more. </p> @@ -39,32 +39,30 @@ footer.hide=1 </div> </section> - -<div class="wrap dac-offset-parent"> - <a class="dac-fab dac-scroll-button" data-scroll-button href="#latest"> - <i class="dac-sprite dac-arrow-down-gray"></i> - </a> -</div> - -<section class="dac-section dac-gray dac-small dac-invert" id="latest"><div class="wrap"> - <h2 class="norule">Latest</h2> - <div class="resource-widget resource-flow-layout col-16" - data-query="type:blog+tag:androidm,type:youtube+tag:androidm" - data-cardSizes="6x6" - data-maxResults="6" - data-initial-results="3"</div> -</div></section> - - -<section class="dac-section dac-light"><div class="wrap"> +<section class="dac-section dac-gray"><div class="wrap"> <h1 class="dac-section-title">Resources</h1> <div class="dac-section-subtitle"> Essential information to help you get your apps ready for Android M. </div> + <div class="resource-widget resource-flow-layout col-16" - data-query="tag:previewresources" + data-query="collection:preview/landing/more" data-cardSizes="6x6" - data-initial-results="6" data-maxResults="16"></div> -</div></section> + + <ul class="dac-section-links"> + <li class="dac-section-link"> + <a href="https://code.google.com/p/android-developer-preview/"> + <span class="dac-sprite dac-auto-chevron"></span> + Report Issues + </a> + </li> + <li class="dac-section-link"><a href="http://g.co/dev/AndroidMDevPreview"> + <span class="dac-sprite dac-auto-chevron"></span> + Join G+ Community + </a> + </li> + </ul> + </div> +</section> diff --git a/docs/html/preview/overview.jd b/docs/html/preview/overview.jd index 4c13fbc..d6bafb1 100644 --- a/docs/html/preview/overview.jd +++ b/docs/html/preview/overview.jd @@ -43,7 +43,7 @@ page.tags="preview", "developer", "android" </h5> <p> - You can get updates over the air, once you’ve flashed a + You can get updates over-the-air, once you’ve flashed a device to the initial preview. </p> </div> @@ -51,12 +51,6 @@ page.tags="preview", "developer", "android" <div class="cols"> -<!--<div class="col-4of12"> -<h5>Early access to new APIs</h5> -<p>Explore the new capabilities and APIs offered in the new platform and give us -feedback. Note that APIs and capabilities may change during the Preview -program.</p> -</div>--> <div class="col-4of12"> <h5> @@ -82,7 +76,7 @@ program.</p> <div class="col-4of12"> <h5> - Feedback and support channels + Feedback and support </h5> <p> @@ -90,6 +84,7 @@ program.</p> "https://code.google.com/p/android-developer-preview/">issue tracker</a>. Connect with other developers in the <a href="http://g.co/dev/AndroidMDevPreview">M Developer Community</a>. + </p> </div> </div> @@ -123,7 +118,7 @@ program.</p> <p> The M Developer Preview runs from May 27 until the final Android M SDK, which we’ll release shortly before the public release during Q3 - 2015. + 2015. </p> <p> @@ -154,7 +149,7 @@ program.</p> <p> As you test and develop on Android M, we strongly recommend <strong>keeping your development environment up-to-date</strong> as Preview updates are released. - To make the process easier, we'll deliver <strong>updates over the air + To make the process easier, we'll deliver <strong>updates over-the-air (OTA)</strong> to devices already flashed to a Preview build, as well as providing system images that you can download and flash manually. </p> @@ -209,7 +204,7 @@ program.</p> <p> You can download these hardware system images for Nexus devices from the - <a href="downloads.html">Downloads page</a>: + <a href="download.html">Downloads page</a>: </p> <ul> @@ -245,24 +240,25 @@ program.</p> </li> <li> - <a href="testing.html">Testing Guide</a> and <a href= - "api-changes.html">Behavior Changes</a> point you to key areas to test. + <a href="{@docRoot}preview/testing/guide.html">Testing Guide</a> and <a href= + "behavior-changes.html">Behavior Changes</a> point you to key areas to test. </li> <li>Documentation of new APIs, including an <a href="api-overview.html">API Overview</a>, - downloadable <a href="">API Reference</a>, and detailed developer guides on - key features such as <a href="">permissions</a>, <a href="">app backup</a>, - and others. + downloadable <a href="{@docRoot}preview/download.html#docs">API Reference</a>, and detailed developer guides on + key features such as + <a href="{@docRoot}preview/features/runtime-permissions.html">permissions</a>, + <a href="{@docRoot}preview/backup/index.html">app backup</a>, and others. </li> <li> - <a href="">Sample code</a> that demonstrates how support + <a href="{@docRoot}preview/samples.html">Sample code</a> that demonstrates how to support permissions and other new features. </li> <li> - <a href="">Release notes</a> for the current version of the M Developer - Preview, including change notes and diff reports. + <a href="{@docRoot}preview/support.html#release-notes">Release notes</a> for the current version + of the M Developer Preview, including change notes and diff reports. </li> </ul> @@ -279,8 +275,9 @@ program.</p> <li><a href="https://code.google.com/p/android-developer-preview/">M Developer Preview Issue Tracker</a> is your <strong>primary feedback channel.</strong> You can report bugs, performance issues, and general - feedback through the issue tracker. You can also check for known issues - and find workaround steps, if available. + feedback through the issue tracker. You can also check for <a + href="https://code.google.com/p/android-developer-preview/wiki/KnownIssues">known issues</a> + and find workaround steps. </li> <li>The <a href="http://g.co/dev/AndroidMDevPreview">Android M Developer @@ -338,7 +335,7 @@ program.</p> <ol> <li>Review the <a href="{@docRoot}preview/api-overview.html">API Overview</a> - and <a href="{@docRoot}preview/behavior.html">Behavior Changes</a> to get an + and <a href="{@docRoot}preview/behavior-changes.html">Behavior Changes</a> to get an idea of what's new and how it affects your apps. </li> @@ -353,7 +350,7 @@ program.</p> Preview updates will be delivered through over-the-air (OTA) updates.</a> </li> - <li>Download the <a href="{@docRoot}preview/reference.html">M Preview API + <li>Download the <a href="{@docRoot}preview/download.html#docs">M Preview API Reference</a> and <a href="{@docRoot}preview/samples.html">M Preview samples</a> to gain more insight into new API features and how to use them in your app. @@ -367,4 +364,4 @@ program.</p> <p> Thank you for your participation in the Android M Developer Preview program! -</p>
\ No newline at end of file +</p> diff --git a/docs/html/preview/preview_toc.cs b/docs/html/preview/preview_toc.cs index 76dfef5..d0aa55f 100644 --- a/docs/html/preview/preview_toc.cs +++ b/docs/html/preview/preview_toc.cs @@ -29,11 +29,11 @@ API Overview</a></div> <ul> <li><a href="<?cs var:toroot ?>preview/features/runtime-permissions.html"> - Runtime Permissions</a></li> + Permissions</a></li> <li><a href="<?cs var:toroot ?>preview/features/app-linking.html"> - App Linking</a></li> + App Links</a></li> <li><a href="<?cs var:toroot ?>preview/backup/index.html"> - Automatic Backups</a></li> + Auto Backup for Apps</a></li> </ul> </li> diff --git a/docs/html/preview/samples.jd b/docs/html/preview/samples.jd index 21d4215..7d47e0e 100644 --- a/docs/html/preview/samples.jd +++ b/docs/html/preview/samples.jd @@ -3,11 +3,10 @@ page.image=images/cards/samples-new_2x.png @jd:body <p> - The following code samples are provided for the M Developer Preview. You can download them in the - Android SDK Manager under the <b>SDK Samples</b> component for the M Developer Preview. + The following code samples are provided for the M Developer Preview. To download + the samples in Android Studio, select the <b>File > Import Samples</b> menu option. </p> -<img src="{@docRoot}images/cards/card-google-cloud-messaging_16-9_2x" class="figure"> <p class="note"> <strong>Note:</strong> These downloadable projects are designed for use with Gradle and Android Studio. @@ -24,13 +23,13 @@ page.image=images/cards/samples-new_2x.png <p><a href="https://github.com/googlesamples/android-RuntimePermissions">Get it on GitHub</a></p> -<h3 id="ConfirmCredentials">Confirm Device Credentials</h3> +<h3 id="ConfirmCredentials">Confirm Credential</h3> <p> This sample demonstrates how to use device credentials as an authentication method in your app. </p> -<p><a href="https://github.com/googlesamples/android-ConfirmDeviceCredentials">Get it on +<p><a href="https://github.com/googlesamples/android-ConfirmCredential">Get it on GitHub</a></p> <h3 id="FingerprintDialog">Fingerprint Dialog</h3> @@ -42,23 +41,14 @@ GitHub</a></p> <p><a href="https://github.com/googlesamples/android-FingerprintDialog">Get it on GitHub</a></p> -<h3 id="AutomaticBackup">Automatic Backup</h3> +<h3 id="AutomaticBackup">Auto Backup for Apps</h3> <p> Android M introduces automatic backup for app settings. This sample demonstrates how to add filtering rules to an app in order to manage settings backup. </p> -<p><a href="https://github.com/googlesamples/android-AutomaticBackup">Get it on GitHub</a></p> - -<h3 id="VoiceCamera">Voice Camera</h3> - -<p> - This sample demonstrates how to implement the "OK Google, take a selfie" voice command and confirm - the user intent with the <code>VoiceInteraction</code> API. -</p> - -<p><a href="https://github.com/googlesamples/android-VoiceCamera">Get it on GitHub</a></p> +<p><a href="https://github.com/googlesamples/android-AutoBackupForApps">Get it on GitHub</a></p> <h3 id="CameraRaw">Camera 2 Raw</h3> @@ -77,15 +67,4 @@ GitHub</a></p> can tell you how many notifications your app is currently showing. </p> -<p><a href="https://github.com/googlesamples/android-ActiveNotification">Get it on GitHub</a></p> - -<h3 id="VoiceSynthesizer">Voice Synthesizer</h3> - -<p> - This sample demonstrates how to use the <code>NativeAudio</code> APIs to demonstrate low-latency - audio processing. -</p> - -<p><a href="https://github.com/googlesamples/android-VoiceSynthesizer">Get it on GitHub</a></p> - - +<p><a href="https://github.com/googlesamples/android-ActiveNotifications">Get it on GitHub</a></p> diff --git a/docs/html/preview/setup-sdk.jd b/docs/html/preview/setup-sdk.jd index f0def9b..1616053 100644 --- a/docs/html/preview/setup-sdk.jd +++ b/docs/html/preview/setup-sdk.jd @@ -8,6 +8,7 @@ page.image=images/cards/card-set-up_16-9_2x.png <div id="qv"> <h2>In this document</h2> <ol> + <li><a href="#get-as13">Get Android Studio 1.3</a></li> <li><a href="#get-sdk">Get the Preview SDK</a></li> <li><a href="#create-update">Create or Update a Project</a></li> <li><a href="#setup-test">Set Up for Testing</a></li> @@ -15,26 +16,91 @@ page.image=images/cards/card-set-up_16-9_2x.png </div> </div> -<p>The Preview SDK is available from the Android SDK Manager. +<p>The M Developer Preview SDK is available from the Android SDK Manager. This document assumes that you are familiar with Android app development, such as using the Android SDK Manager and creating projects. If you are new to Android, see <a href="{@docRoot}training/basics/firstapp/index.html">Building Your First App</a> training lesson first.</a></p> -<h2 id="get-sdk">Get the Preview SDK</h2> +<h2 id="get-as13">Get Android Studio 1.3</h2> + +<p>The Developer Preview requires Android Studio 1.3, which is in +preview status. You need +to install the preview version of Android Studio 1.3 to work with the Preview +SDK.</p> -<p>To add the Android Preview SDK components to your development environment:</p> +<p class="caution"><strong>Caution:</strong> The canary preview of Android +Studio 1.3 is still in active development. If you are using your primary development +machine to test the developer preview, you should create a second installation +of Android Studio to use for testing.</p> + +<p>To install the Android Studio 1.3 preview:</p> <ol> - <li>Start the <a href="{@docRoot}tools/help/sdk-manager.html">Android SDK Manager</a>.</li> - <li>In the <strong>Tools</strong> section, select the latest Android <strong>SDK Tools</strong>, - <strong>Platform-tools</strong>, and <strong>Build-tools</strong>.</li> - <li>Select everything under the <strong>Android M Developer Preview</strong> section and - click <strong>Install packages...</strong></li> - <li>Accept the Licensing Agreement for all of the packages and click - <strong>Install</strong>.</li> + <li>Download and launch <a href="{@docRoot}tools/studio/index.html">Android + Studio</a>. + </li> + + <li>Open the <strong>Settings</strong> window by choosing <strong>File > + Settings</strong>. Choose the <strong>Appearance & Behavior > System + Settings > Updates</strong> panel.</li> + + <li> On the <strong>Updates</strong> panel, choose the option + <strong>Automatically check updates for: Canary Chanel</strong>. + </li> + + <li>On the <strong>Updates</strong> panel, select <strong>Check Now</strong> + to check for the latest canary build. Download and install the build when you + are prompted. + </li> </ol> +<h2 id="get-sdk">Get the Preview SDK</h2> + +<p>To add the Preview SDK components to your development environment:</p> + +<ol> + <li>Launch the Android Studio 1.3 preview. + </li> + + <li>Open the <strong>Settings</strong> window by choosing <strong>File > + Settings</strong>. Choose the <strong>Appearance & Behavior > System + Settings > Updates</strong> panel.</li> + + <li>On the <strong>Updates</strong> panel, choose the options + <strong>Automatically check updates for: Canary Chanel</strong> and + <strong>Automatically check updates for Android SDK: Preview Chanel</strong>. + </li> + + <li>Click the <strong>Android SDK Manager</strong> button to launch the SDK + Manager. (With Android Studio 1.3, the SDK Manager is integrated into Android + Studio instead of being a standalone application.) + </li> + + <li>Under the <strong>Platforms</strong> section, select <strong>Android MNC + Preview</strong>. + </li> + + <li>In the <strong>Tools</strong> section, select the latest Android <strong> + SDK Tools</strong>, <strong>Platform-tools</strong>, and + <strong>Build-tools</strong>. + </li> + + <li>Click <strong>Install packages</strong> and accept the licensing + agreement for all of the packages. + </li> + + <li>Verify that the M Developer Preview is installed by opening the <strong> + Settings</strong> window and choosing the <strong>Appearance & Behavior + > System Settings > Android SDK</strong> panel.</li> + + <li>On the <strong>Android SDK</strong> panel, choose + the <strong>SDK Platforms</strong> tab. <strong>Android MNC + Preview</strong> should be listed as <em>Installed</em>. Also, open the + <strong>SDK Tools</strong> tab to verify that the latest tools are + installed. + </li> +</ol> <p>After completing these steps, the preview components are available in your development environment. </p> @@ -50,7 +116,7 @@ App</a> training lesson first.</a></p> <h3 id="create">Create a new project</h3> <p> - We recommend using Android Studio for create a project with the preview. Follow the steps + We recommend using Android Studio to create a project with the preview. Follow the steps described in <a href="{@docRoot}sdk/installing/create-project.html">Creating a Project</a> until you arrive at the <em>Form Factors</em> screen in the project wizard. Then perform the following steps to create a project configured for the preview. @@ -66,7 +132,7 @@ App</a> training lesson first.</a></p> <p> For existing projects, you must modify the project configuration to enable the preview APIs. In - your the development environment, open the <code>build.gradle</code> file for your module and + your development environment, open the <code>build.gradle</code> file for your module and set these values as follows: </p> @@ -80,7 +146,7 @@ App</a> training lesson first.</a></p> <h2 id="setup-test">Set Up for Testing</h2> <p> - Testing app with the preview requires that you have a device or virtual device configured with + Testing an app with the preview requires that you have a device or virtual device configured with the preview version of the platform. If you have a compatible device, you can install the preview platform for testing. Otherwise, you can configure a virtual device for testing. </p> @@ -88,9 +154,9 @@ App</a> training lesson first.</a></p> <h3 id="setup-device">Set up a Physical Device</h3> <p> - If you have a Nexus 5, Nexus 6, Nexus 9, or Nexus Player, you can install a preview + If you have a Nexus 5, Nexus 6, Nexus 9, or Android TV, you can install a preview system image on these devices for testing your app. - You can set up virtual device with the preview version of the platform from within Android Studio + You can set up a virtual device with the preview version of the platform from within Android Studio using the Android Virtual Device Manager tool. </p> @@ -109,7 +175,7 @@ App</a> training lesson first.</a></p> <p>To create an AVD with the AVD Manager:</p> <ol> - <li>Install the M Preview SDK in your development environment, as described + <li>Install the Preview SDK in your development environment, as described in <a href="{@docRoot}preview/setup-sdk.html">Setting Up the Preview SDK.</a></li> <li>Follow the steps in diff --git a/docs/html/preview/support.jd b/docs/html/preview/support.jd index 3ed1487..dd9736a 100644 --- a/docs/html/preview/support.jd +++ b/docs/html/preview/support.jd @@ -11,7 +11,7 @@ page.image=images/cards/card-support_16-9_2x.png <p> For more support, join the - <a href="https://plus.google.com/communities/101985907812750684586">M Developer + <a href="http://g.co/dev/AndroidMDevPreview">M Developer Preview Google+ community</a> to discuss your development experiences. </p> diff --git a/docs/html/preview/testing/guide.jd b/docs/html/preview/testing/guide.jd index 1879268..07a25a2 100644 --- a/docs/html/preview/testing/guide.jd +++ b/docs/html/preview/testing/guide.jd @@ -1,5 +1,6 @@ page.title=Testing Guide -page.image=images/cards/card-set-up_16-9_2x.png +page.image=images/cards/card-build_16x9_2x.png +page.keywords=previewresources,androidm,testing,permissions @jd:body @@ -7,8 +8,9 @@ page.image=images/cards/card-set-up_16-9_2x.png <div id="qv"> <h2>In this document</h2> <ol> - <li><a href="#runtime-permissions">Testing Runtime Permissions</a></li> + <li><a href="#runtime-permissions">Testing Permissions</a></li> <li><a href="#doze-standby">Testing Doze and App Standby</a></li> + <li><a href="#ids">Auto Backup and Device Identifiers</a></li> </ol> </div> </div> @@ -17,7 +19,7 @@ page.image=images/cards/card-set-up_16-9_2x.png The Android M Developer Preview gives you an opportunity to ensure your apps work with the next version of the platform. This preview includes a number of APIs and behavior changes that can impact your app, as described in the <a href="{@docRoot}preview/api-overview.html">API - Overview</a> and <a href="{@docRoot}preview/api-changes.html">Behavior Changes</a>. In testing + Overview</a> and <a href="{@docRoot}preview/behavior-changes.html">Behavior Changes</a>. In testing your app with the preview, there are some specific system changes that you should focus on to ensure that users have a good experience. </p> @@ -29,10 +31,11 @@ page.image=images/cards/card-set-up_16-9_2x.png </p> <ul> - <li><a href="#runtime-permissions">Runtime Permissions</a> + <li><a href="#runtime-permissions">Permissions</a> </li> - <li><a href="#doze-mode">Doze and App Standby</a> + <li><a href="#doze-standby">Doze and App Standby</a> </li> + <li><a href="#ids">Auto Backup and Device Identifiers</a></li> </ul> <p> @@ -41,10 +44,10 @@ page.image=images/cards/card-set-up_16-9_2x.png </p> -<h2 id="runtime-permissions">Testing Runtime Permissions</h2> +<h2 id="runtime-permissions">Testing Permissions</h2> <p> - The <a href="{@docRoot}preview/features/runtime-permissions.html">Runtime Permissions</a> feature + The new <a href="{@docRoot}preview/features/runtime-permissions.html">Permissions</a> model changes the way that permissions are allocated to your app by the user. Instead of granting all permissions during the install procedure, your app must ask the user for individual permissions at runtime. For users this behavior provides more granular control over each app’s activities, as @@ -55,7 +58,7 @@ page.image=images/cards/card-set-up_16-9_2x.png </p> <p> - This change that affects all apps running on the new platform, even those not targeting the new + This change affects all apps running on the new platform, even those not targeting the new platform version. The platform provides a limited compatibility behavior for legacy apps, but you should begin planning your app’s migration to the new permissions model now, with a goal of publishing an updated version of your app at the official platform launch. @@ -89,7 +92,7 @@ page.image=images/cards/card-set-up_16-9_2x.png <h3 id="permission-test-strategy">Test strategy</h3> <p> - The Runtime Permissions change affects the structure and design of your app, as well as + The permissions change affects the structure and design of your app, as well as the user experience and flows you provide to users. You should assess your app’s current permissions use and start planning for the new flows you want to offer. The official release of the platform provides compatibility behavior, but you should plan on updating your app and not @@ -112,8 +115,8 @@ page.image=images/cards/card-set-up_16-9_2x.png </p> <p> - For more information on the behavior of Runtime Permissions, testing, and best practices, see the - <a href="{@docRoot}preview/features/runtime-permissions.html">Runtime Permissions</a> developer + For more information on the behavior of runtime permissions, testing, and best practices, see the + <a href="{@docRoot}preview/features/runtime-permissions.html">Permissions</a> developer preview page. </p> @@ -121,7 +124,7 @@ page.image=images/cards/card-set-up_16-9_2x.png <h2 id="doze-standby">Testing Doze and App Standby</h2> <p> - The power saving features of Doze and App Standby limits the amount of background processing that + The power saving features of Doze and App Standby limit the amount of background processing that your app can perform when a device is in an idle state or while your app is not in focus. The restrictions the system may impose on apps include limited or no network access, suspended background tasks, suspended Notifications, ignored wake requests, and alarms. To ensure @@ -174,3 +177,11 @@ $ adb shell am set-idle <packageName> true from standby mode. In particular, you should check if your app's Notifications and background jobs continue to function as expected.</li> </ol> + +<h2 id="ids">Auto Backup for Apps and Device-Specific Identifiers</h2> + +<p>If your app is persisting any device-specific identifiers, such as Google +Cloud Messaging registration ID, in internal storage, +make sure to follow best practices to exclude the storage +location from auto-backup, as described in <a href="{@docRoot}preview/backup/index.html">Auto +Backup for Apps</a>. </p> diff --git a/docs/html/preview/testing/performance.jd b/docs/html/preview/testing/performance.jd index a61091f..4ac5a90 100644 --- a/docs/html/preview/testing/performance.jd +++ b/docs/html/preview/testing/performance.jd @@ -1,4 +1,6 @@ page.title=Testing Display Performance +page.image=images/cards/card-test-performance_2x.png +page.keywords=performance, fps, tools @jd:body diff --git a/docs/html/samples/system.jd b/docs/html/samples/system.jd new file mode 100644 index 0000000..618673d --- /dev/null +++ b/docs/html/samples/system.jd @@ -0,0 +1,11 @@ +page.title=System +@jd:body + + +<div id="samples" class="system"> +</div> + + +<script> + $(document).ready(showSamples); +</script> diff --git a/docs/html/tools/data-binding/guide.jd b/docs/html/tools/data-binding/guide.jd index 6a933d8..71409e4 100644 --- a/docs/html/tools/data-binding/guide.jd +++ b/docs/html/tools/data-binding/guide.jd @@ -26,16 +26,16 @@ tracker</a>. Stay tuned for more information about Data Binding and examples of <a href="#data_binding_layout_files">Data Binding Layout Files</a> <ol> <li> - <a href="writing_expressions">Writing your first data binding + <a href="#writing_expressions">Writing your first data binding expressions</a> </li> <li> - <a href="data_object">Data Object</a> + <a href="#data_object">Data Object</a> </li> <li> - <a href="binding_data">Binding Data</a> + <a href="#binding_data">Binding Data</a> </li> </ol> </li> @@ -44,23 +44,23 @@ tracker</a>. Stay tuned for more information about Data Binding and examples of <a href="#layout_details">Layout Details</a> <ol> <li> - <a href="imports">Imports</a> + <a href="#imports">Imports</a> </li> <li> - <a href="variables">Variables</a> + <a href="#variables">Variables</a> </li> <li> - <a href="custom_binding_class_names">Custom Binding Class Names</a> + <a href="#custom_binding_class_names">Custom Binding Class Names</a> </li> <li> - <a href="includes">Includes</a> + <a href="#includes">Includes</a> </li> <li> - <a href="expression_language">Expression Language</a> + <a href="#expression_language">Expression Language</a> </li> </ol> </li> @@ -69,15 +69,15 @@ tracker</a>. Stay tuned for more information about Data Binding and examples of <a href="#data_objects">Data Objects</a> <ol> <li> - <a href="observable_objects">Observable Objects</a> + <a href="#observable_objects">Observable Objects</a> </li> <li> - <a href="observablefields">ObservableFields</a> + <a href="#observablefields">ObservableFields</a> </li> <li> - <a href="observable_collections">Observable Collections</a> + <a href="#observable_collections">Observable Collections</a> </li> </ol> </li> @@ -86,23 +86,23 @@ tracker</a>. Stay tuned for more information about Data Binding and examples of <a href="#generated_binding">Generated Binding</a> <ol> <li> - <a href="creating">Creating</a> + <a href="#creating">Creating</a> </li> <li> - <a href="views_with_ids">Views With IDs</a> + <a href="#views_with_ids">Views With IDs</a> </li> <li> - <a href="variables">Variables</a> + <a href="#variables">Variables</a> </li> <li> - <a href="viewstubs">ViewStubs</a> + <a href="#viewstubs">ViewStubs</a> </li> <li> - <a href="advanced_binding">Advanced Binding</a> + <a href="#advanced_binding">Advanced Binding</a> </li> </ol> </li> @@ -111,15 +111,15 @@ tracker</a>. Stay tuned for more information about Data Binding and examples of <a href="#attribute_setters">Attribute Setters</a> <ol> <li> - <a href="automatic_setters">Automatic Setters</a> + <a href="#automatic_setters">Automatic Setters</a> </li> <li> - <a href="renamed_setters">Renamed Setters</a> + <a href="#renamed_setters">Renamed Setters</a> </li> <li> - <a href="custom_setters">Custom Setters</a> + <a href="#custom_setters">Custom Setters</a> </li> </ol> </li> @@ -128,11 +128,11 @@ tracker</a>. Stay tuned for more information about Data Binding and examples of <a href="#converters">Converters</a> <ol> <li> - <a href="object_conversions">Object Conversions</a> + <a href="#object_conversions">Object Conversions</a> </li> <li> - <a href="custom_conversions">Custom Conversions</a> + <a href="#custom_conversions">Custom Conversions</a> </li> </ol> </li> diff --git a/docs/html/tools/data-binding/index.jd b/docs/html/tools/data-binding/index.jd deleted file mode 100644 index 4ad11b6..0000000 --- a/docs/html/tools/data-binding/index.jd +++ /dev/null @@ -1,18 +0,0 @@ -page.title=Android Data Binding Library -page.metaDescription= - -@jd:body - -<p> - Some text here. -</p> - - - -<!-- <h2>Related Resources</h2> - <div class="resource-widget resource-flow-layout col-16" - data-query="tag:engagement" - data-sortOrder="random" - data-cardSizes="6x2" - data-maxResults="3"> - </div> --> diff --git a/docs/html/tools/support-library/index.jd b/docs/html/tools/support-library/index.jd index 1dad6b8..5688d8a 100644 --- a/docs/html/tools/support-library/index.jd +++ b/docs/html/tools/support-library/index.jd @@ -59,9 +59,9 @@ page.title=Support Library <p>This section provides details about the Support Library package releases.</p> -<div class="toggle-content open"> +<div class="toggle-content opened"> <p id="rev21"><a href="#" onclick="return toggleContent(this)"> - <img src="{@docRoot}assets/images/triangle-open.png" class="toggle-content-img" alt="" + <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img" alt="" />Android Support Library, revision 22.2.0</a> <em>(May 2015)</em> </p> <div class="toggle-content-toggleme"> @@ -138,7 +138,6 @@ page.title=Support Library </li> <li>Added the {@link android.support.v4.media.session.PlaybackStateCompat.Builder#addCustomAction addCustomAction()}, -{@link android.support.v4.media.session.PlaybackStateCompat.Builder#addCustomAction addCustomAction()}, {@link android.support.v4.media.session.PlaybackStateCompat.Builder#setActiveQueueItemId setActiveQueueItemId()}, and {@link android.support.v4.media.session.PlaybackStateCompat.Builder#setExtras setExtras()} diff --git a/docs/html/tools/tools_toc.cs b/docs/html/tools/tools_toc.cs index f46dcaa..9951330 100644 --- a/docs/html/tools/tools_toc.cs +++ b/docs/html/tools/tools_toc.cs @@ -295,11 +295,8 @@ class="en">Support Library</span></a></div> </li><!-- end of support library --> <li class="nav-section"> - <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/data-binding/index.html"><span + <div class="nav-section-header empty"><a href="<?cs var:toroot ?>tools/data-binding/guide.html"><span class="en">Data Binding Library</span></a></div> - <ul> - <li><a href="<?cs var:toroot ?>tools/data-binding/guide.html">Guide</a></li> - </ul> </li><!-- end of support library --> diff --git a/docs/html/training/index.jd b/docs/html/training/index.jd index 3e0d593..1b0b1fe 100644 --- a/docs/html/training/index.jd +++ b/docs/html/training/index.jd @@ -37,6 +37,6 @@ Classes are organized into several groups you can see at the top-level of the le data-query="collection:develop/landing/courses" data-sortOrder="random" data-cardSizes="6x6" - data-maxResults="9" + data-maxResults="12" data-initial-results="3"></div> </div>
\ No newline at end of file diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java index 28c26ff..b8f64a4 100644 --- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java @@ -31,6 +31,7 @@ import android.graphics.Rect; import android.util.ArrayMap; import android.util.AttributeSet; import android.util.Log; +import android.view.View; import com.android.internal.R; @@ -200,7 +201,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable { } @Override - public boolean onLayoutDirectionChange(int layoutDirection) { + public boolean onLayoutDirectionChanged(@View.ResolvedLayoutDir int layoutDirection) { return mAnimatedVectorState.mVectorDrawable.setLayoutDirection(layoutDirection); } diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java index 22ff3e7..e8e4664 100644 --- a/graphics/java/android/graphics/drawable/Drawable.java +++ b/graphics/java/android/graphics/drawable/Drawable.java @@ -276,7 +276,7 @@ public abstract class Drawable { public void setDither(boolean dither) {} /** - * @return whether this drawable dither its colors + * @return whether this drawable dithers its colors * @see #setDither(boolean) */ public boolean getDither() { @@ -295,7 +295,7 @@ public abstract class Drawable { * @return whether this drawable filters its bitmap * @see #setFilterBitmap(boolean) */ - public boolean getFilterBitmap() { + public boolean isFilterBitmap() { return false; } @@ -444,7 +444,7 @@ public abstract class Drawable { public final boolean setLayoutDirection(@View.ResolvedLayoutDir int layoutDirection) { if (mLayoutDirection != layoutDirection) { mLayoutDirection = layoutDirection; - return onLayoutDirectionChange(layoutDirection); + return onLayoutDirectionChanged(layoutDirection); } return false; } @@ -457,7 +457,7 @@ public abstract class Drawable { * the drawable to change and it needs to be re-drawn * @see #setLayoutDirection(int) */ - public boolean onLayoutDirectionChange(@View.ResolvedLayoutDir int layoutDirection) { + public boolean onLayoutDirectionChanged(@View.ResolvedLayoutDir int layoutDirection) { return false; } diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java index 4a06805..8b801c3 100644 --- a/graphics/java/android/graphics/drawable/DrawableContainer.java +++ b/graphics/java/android/graphics/drawable/DrawableContainer.java @@ -31,6 +31,7 @@ import android.graphics.PorterDuff.Mode; import android.os.SystemClock; import android.util.LayoutDirection; import android.util.SparseArray; +import android.view.View; import java.util.Collection; @@ -337,7 +338,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { } @Override - public boolean onLayoutDirectionChange(int layoutDirection) { + public boolean onLayoutDirectionChanged(@View.ResolvedLayoutDir int layoutDirection) { // Let the container handle setting its own layout direction. Otherwise, // we're accessing potentially unused states. return mDrawableContainerState.setLayoutDirection(layoutDirection, getCurrentIndex()); diff --git a/graphics/java/android/graphics/drawable/DrawableWrapper.java b/graphics/java/android/graphics/drawable/DrawableWrapper.java index bd8eae0..58d43f9 100644 --- a/graphics/java/android/graphics/drawable/DrawableWrapper.java +++ b/graphics/java/android/graphics/drawable/DrawableWrapper.java @@ -258,7 +258,7 @@ public abstract class DrawableWrapper extends Drawable implements Drawable.Callb } @Override - public boolean onLayoutDirectionChange(@View.ResolvedLayoutDir int layoutDirection) { + public boolean onLayoutDirectionChanged(@View.ResolvedLayoutDir int layoutDirection) { return mDrawable != null && mDrawable.setLayoutDirection(layoutDirection); } diff --git a/graphics/java/android/graphics/drawable/LayerDrawable.java b/graphics/java/android/graphics/drawable/LayerDrawable.java index e5b4612..5c00a23 100644 --- a/graphics/java/android/graphics/drawable/LayerDrawable.java +++ b/graphics/java/android/graphics/drawable/LayerDrawable.java @@ -1662,7 +1662,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { } @Override - public boolean onLayoutDirectionChange(int layoutDirection) { + public boolean onLayoutDirectionChanged(@View.ResolvedLayoutDir int layoutDirection) { boolean changed = false; final ChildDrawable[] array = mLayerState.mChildren; diff --git a/keystore/java/android/security/keystore/KeyGenParameterSpec.java b/keystore/java/android/security/keystore/KeyGenParameterSpec.java index 1d4c188..d861302 100644 --- a/keystore/java/android/security/keystore/KeyGenParameterSpec.java +++ b/keystore/java/android/security/keystore/KeyGenParameterSpec.java @@ -743,7 +743,7 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec { * <p>This restriction applies only to private key operations. Public key operations are not * restricted. * - * <p><b>NOTE: This has currently no effect.</b> + * <p><b>NOTE: This has currently no effect on asymmetric key pairs.</b> * * @see #setUserAuthenticationValidityDurationSeconds(int) */ @@ -759,7 +759,7 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec { * * <p>By default, the user needs to authenticate for every use of the key. * - * <p><b>NOTE: This has currently no effect.</b> + * <p><b>NOTE: This has currently no effect on asymmetric key pairs.</b> * * @param seconds duration in seconds or {@code -1} if the user needs to authenticate for * every use of the key. diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 9146b68..9e5ec28 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -83,8 +83,9 @@ void RenderNode::setStagingDisplayList(DisplayListData* data) { * display list. This function should remain in sync with the replay() function. */ void RenderNode::output(uint32_t level) { - ALOGD("%*sStart display list (%p, %s%s%s%s)", (level - 1) * 2, "", this, + ALOGD("%*sStart display list (%p, %s%s%s%s%s)", (level - 1) * 2, "", this, getName(), + (MathUtils::isZero(properties().getAlpha()) ? ", zero alpha" : ""), (properties().hasShadow() ? ", casting shadow" : ""), (isRenderable() ? "" : ", empty"), (mLayer != nullptr ? ", on HW Layer" : "")); diff --git a/libs/hwui/RenderProperties.cpp b/libs/hwui/RenderProperties.cpp index 7b75690..07b8ce6 100644 --- a/libs/hwui/RenderProperties.cpp +++ b/libs/hwui/RenderProperties.cpp @@ -146,12 +146,12 @@ void RenderProperties::debugOutputProperties(const int level) const { const bool isLayer = effectiveLayerType() != LayerType::None; int clipFlags = getClippingFlags(); - if (mPrimitiveFields.mAlpha < 1) { + if (mPrimitiveFields.mAlpha < 1 + && !MathUtils::isZero(mPrimitiveFields.mAlpha)) { if (isLayer) { clipFlags &= ~CLIP_TO_BOUNDS; // bounds clipping done by layer } - LOG_ALWAYS_FATAL_IF(!isLayer && mPrimitiveFields.mHasOverlappingRendering); ALOGD("%*sScaleAlpha %.2f", level * 2, "", mPrimitiveFields.mAlpha); } if (clipFlags) { diff --git a/libs/hwui/renderstate/RenderState.cpp b/libs/hwui/renderstate/RenderState.cpp index d7c8316..df12e63 100644 --- a/libs/hwui/renderstate/RenderState.cpp +++ b/libs/hwui/renderstate/RenderState.cpp @@ -266,10 +266,10 @@ void RenderState::render(const Glop& glop) { mCaches->textureState().activateTexture(0); if (texture.clamp != GL_INVALID_ENUM) { - texture.texture->setWrap(texture.clamp, true); + texture.texture->setWrap(texture.clamp, true, false, texture.target); } if (texture.filter != GL_INVALID_ENUM) { - texture.texture->setFilter(texture.filter, true); + texture.texture->setFilter(texture.filter, true, false, texture.target); } mCaches->textureState().bindTexture(texture.target, texture.texture->id); diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index 0e67daa..b2fa0ac 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -106,9 +106,6 @@ public final class MediaFormat { public static final String MIMETYPE_AUDIO_FLAC = "audio/flac"; public static final String MIMETYPE_AUDIO_MSGSM = "audio/gsm"; public static final String MIMETYPE_AUDIO_AC3 = "audio/ac3"; - /** - * @hide - */ public static final String MIMETYPE_AUDIO_EAC3 = "audio/eac3"; /** diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp index 8038cdf..a705bcc 100644 --- a/media/jni/soundpool/SoundPool.cpp +++ b/media/jni/soundpool/SoundPool.cpp @@ -753,6 +753,7 @@ void SoundChannel::play(const sp<Sample>& sample, int nextChannelID, float leftV status = newTrack->initCheck(); if (status != NO_ERROR) { ALOGE("Error creating AudioTrack"); + // newTrack goes out of scope, so reference count drops to zero goto exit; } // From now on, AudioTrack callbacks received with previous toggle value will be ignored. diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java index 66ed933..bcfcbf3 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java @@ -823,13 +823,20 @@ public class CodecTest { duration = mMediaPlayer.getDuration(); // start to play mMediaPlayer.start(); - waittime = duration - mMediaPlayer.getCurrentPosition(); - synchronized(onCompletion){ - try { - onCompletion.wait(waittime + buffertime); - }catch (Exception e) { - Log.v(TAG, "playMediaSamples are interrupted"); - return false; + if (duration < 0) { + Log.w(TAG, filePath + " has unknown duration, waiting until playback completes"); + while (mMediaPlayer.isPlaying()) { + SystemClock.sleep(1000); + } + } else { + waittime = duration - mMediaPlayer.getCurrentPosition(); + synchronized(onCompletion){ + try { + onCompletion.wait(waittime + buffertime); + } catch (Exception e) { + Log.v(TAG, "playMediaSamples are interrupted"); + return false; + } } } terminateMessageLooper(); diff --git a/packages/DocumentsUI/src/com/android/documentsui/CopyService.java b/packages/DocumentsUI/src/com/android/documentsui/CopyService.java index 6e050c6..506ec58 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/CopyService.java +++ b/packages/DocumentsUI/src/com/android/documentsui/CopyService.java @@ -173,8 +173,6 @@ public class CopyService extends IntentService { .setAutoCancel(true); mNotificationManager.notify(mJobId, 0, errorBuilder.build()); } - - // TODO: Display a toast if the copy was cancelled. } } @@ -306,13 +304,15 @@ public class CopyService extends IntentService { private void handleCancel(Intent intent) { final String cancelledId = intent.getStringExtra(EXTRA_CANCEL); // Do nothing if the cancelled ID doesn't match the current job ID. This prevents racey - // cancellation requests from affecting unrelated copy jobs. - if (Objects.equals(mJobId, cancelledId)) { + // cancellation requests from affecting unrelated copy jobs. However, if the current job ID + // is null, the service most likely crashed and was revived by the incoming cancel intent. + // In that case, always allow the cancellation to proceed. + if (Objects.equals(mJobId, cancelledId) || mJobId == null) { // Set the cancel flag. This causes the copy loops to exit. mIsCancelled = true; // Dismiss the progress notification here rather than in the copy loop. This preserves // interactivity for the user in case the copy loop is stalled. - mNotificationManager.cancel(mJobId, 0); + mNotificationManager.cancel(cancelledId, 0); } } diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java index 6295de4..4edc1c9 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java @@ -114,35 +114,40 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout if (mPendingLockCheck != null) { mPendingLockCheck.cancel(false); } + + if (entry.length() < MINIMUM_PASSWORD_LENGTH_BEFORE_REPORT) { + // to avoid accidental lockout, only count attempts that are long enough to be a + // real password. This may require some tweaking. + setPasswordEntryInputEnabled(true); + onPasswordChecked(entry, false, 0); + return; + } + mPendingLockCheck = LockPatternChecker.checkPassword( mLockPatternUtils, entry, KeyguardUpdateMonitor.getCurrentUser(), new LockPatternChecker.OnCheckCallback() { @Override - public void onChecked(boolean matched) { + public void onChecked(boolean matched, int timeoutMs) { setPasswordEntryInputEnabled(true); mPendingLockCheck = null; - onPasswordChecked(entry, matched); + onPasswordChecked(entry, matched, timeoutMs); } }); } - private void onPasswordChecked(String entry, boolean matched) { + private void onPasswordChecked(String entry, boolean matched, int timeoutMs) { if (matched) { - mCallback.reportUnlockAttempt(true); + mCallback.reportUnlockAttempt(true, 0); mCallback.dismiss(true); } else { - if (entry.length() > MINIMUM_PASSWORD_LENGTH_BEFORE_REPORT ) { - // to avoid accidental lockout, only count attempts that are long enough to be a - // real password. This may require some tweaking. - mCallback.reportUnlockAttempt(false); - int attempts = KeyguardUpdateMonitor.getInstance(mContext).getFailedUnlockAttempts(); - if (0 == (attempts % LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT)) { - long deadline = mLockPatternUtils.setLockoutAttemptDeadline( - KeyguardUpdateMonitor.getCurrentUser()); - handleAttemptLockout(deadline); - } + mCallback.reportUnlockAttempt(false, timeoutMs); + int attempts = KeyguardUpdateMonitor.getInstance(mContext).getFailedUnlockAttempts(); + if (timeoutMs > 0) { + long deadline = mLockPatternUtils.setLockoutAttemptDeadline( + KeyguardUpdateMonitor.getCurrentUser(), timeoutMs); + handleAttemptLockout(deadline); } mSecurityMessageDisplay.setMessage(getWrongPasswordStringId(), true); } diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java index 35c6873..ed595c0 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java @@ -224,23 +224,30 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit mPendingLockCheck.cancel(false); } + if (pattern.size() < LockPatternUtils.MIN_PATTERN_REGISTER_FAIL) { + mLockPatternView.enableInput(); + onPatternChecked(pattern, false, 0); + return; + } + mPendingLockCheck = LockPatternChecker.checkPattern( mLockPatternUtils, pattern, KeyguardUpdateMonitor.getCurrentUser(), new LockPatternChecker.OnCheckCallback() { @Override - public void onChecked(boolean matched) { + public void onChecked(boolean matched, int timeoutMs) { mLockPatternView.enableInput(); mPendingLockCheck = null; - onPatternChecked(pattern, matched); + onPatternChecked(pattern, matched, timeoutMs); } }); } - private void onPatternChecked(List<LockPatternView.Cell> pattern, boolean matched) { + private void onPatternChecked(List<LockPatternView.Cell> pattern, boolean matched, + int timeoutMs) { if (matched) { - mCallback.reportUnlockAttempt(true); + mCallback.reportUnlockAttempt(true, 0); mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Correct); mCallback.dismiss(true); } else { @@ -248,16 +255,11 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit mCallback.userActivity(); } mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Wrong); - boolean registeredAttempt = - pattern.size() >= LockPatternUtils.MIN_PATTERN_REGISTER_FAIL; - if (registeredAttempt) { - mCallback.reportUnlockAttempt(false); - } + mCallback.reportUnlockAttempt(false, timeoutMs); int attempts = mKeyguardUpdateMonitor.getFailedUnlockAttempts(); - if (registeredAttempt && - 0 == (attempts % LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT)) { + if (timeoutMs > 0) { long deadline = mLockPatternUtils.setLockoutAttemptDeadline( - KeyguardUpdateMonitor.getCurrentUser()); + KeyguardUpdateMonitor.getCurrentUser(), timeoutMs); handleAttemptLockout(deadline); } else { mSecurityMessageDisplay.setMessage(R.string.kg_wrong_pattern, true); diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityCallback.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityCallback.java index 5877bc8..836c195 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityCallback.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityCallback.java @@ -37,8 +37,10 @@ public interface KeyguardSecurityCallback { /** * Call to report an unlock attempt. * @param success set to 'true' if user correctly entered security credentials. + * @param timeoutMs timeout in milliseconds to wait before reattempting an unlock. + * Only nonzero if 'success' is false */ - void reportUnlockAttempt(boolean success); + void reportUnlockAttempt(boolean success, int timeoutMs); /** * Resets the keyguard view. diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java index 4d89a8d..d17b25a 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java @@ -176,8 +176,8 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe dialog.show(); } - private void showTimeoutDialog() { - int timeoutInSeconds = (int) LockPatternUtils.FAILED_ATTEMPT_TIMEOUT_MS / 1000; + private void showTimeoutDialog(int timeoutMs) { + int timeoutInSeconds = (int) timeoutMs / 1000; int messageId = 0; switch (mSecurityModel.getSecurityMode()) { @@ -244,16 +244,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe showDialog(null, message); } - private void showAlmostAtAccountLoginDialog() { - final int timeoutInSeconds = (int) LockPatternUtils.FAILED_ATTEMPT_TIMEOUT_MS / 1000; - final int count = LockPatternUtils.FAILED_ATTEMPTS_BEFORE_RESET - - LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT; - String message = mContext.getString(R.string.kg_failed_attempts_almost_at_login, - count, LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT, timeoutInSeconds); - showDialog(null, message); - } - - private void reportFailedUnlockAttempt() { + private void reportFailedUnlockAttempt(int timeoutMs) { final KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext); final int failedAttempts = monitor.getFailedUnlockAttempts() + 1; // +1 for this time @@ -290,14 +281,11 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe Slog.i(TAG, "Too many unlock attempts; user " + expiringUser + " will be wiped!"); showWipeDialog(failedAttempts, userType); } - } else { - showTimeout = - (failedAttempts % LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT) == 0; } monitor.reportFailedUnlockAttempt(); mLockPatternUtils.reportFailedPasswordAttempt(KeyguardUpdateMonitor.getCurrentUser()); - if (showTimeout) { - showTimeoutDialog(); + if (timeoutMs > 0) { + showTimeoutDialog(timeoutMs); } } @@ -425,14 +413,14 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe return mIsVerifyUnlockOnly; } - public void reportUnlockAttempt(boolean success) { + public void reportUnlockAttempt(boolean success, int timeoutMs) { KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext); if (success) { monitor.clearFailedUnlockAttempts(); mLockPatternUtils.reportSuccessfulPasswordAttempt( KeyguardUpdateMonitor.getCurrentUser()); } else { - KeyguardSecurityContainer.this.reportFailedUnlockAttempt(); + KeyguardSecurityContainer.this.reportFailedUnlockAttempt(timeoutMs); } } @@ -448,7 +436,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe @Override public void userActivity() { } @Override - public void reportUnlockAttempt(boolean success) { } + public void reportUnlockAttempt(boolean success, int timeoutMs) { } @Override public boolean isVerifyUnlockOnly() { return false; } @Override diff --git a/packages/PrintSpooler/res/values/themes.xml b/packages/PrintSpooler/res/values/themes.xml index db319e9..05de5b7 100644 --- a/packages/PrintSpooler/res/values/themes.xml +++ b/packages/PrintSpooler/res/values/themes.xml @@ -16,7 +16,7 @@ <resources> - <style name="PrintActivity" parent="@android:style/Theme.Material.Settings"> + <style name="PrintActivity" parent="@android:style/Theme.DeviceDefault"> <item name="android:windowIsTranslucent">true</item> <item name="android:windowBackground">@android:color/transparent</item> <item name="android:windowContentOverlay">@null</item> diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index 7049d6a..3130875 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java @@ -755,7 +755,7 @@ public class AccessPoint implements Comparable<AccessPoint> { int index = state.ordinal(); if (index >= formats.length || formats[index].length() == 0) { - return null; + return ""; } return String.format(formats[index], ssid); } diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index e47c7a0..cc8e46b 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -225,6 +225,12 @@ <!-- Callback for dismissing screenshot notification after a share target is picked --> <receiver android:name=".screenshot.GlobalScreenshot$TargetChosenReceiver" + android:process=":screenshot" + android:exported="false" /> + + <!-- Callback for deleting screenshot notification --> + <receiver android:name=".screenshot.GlobalScreenshot$DeleteScreenshotReceiver" + android:process=":screenshot" android:exported="false" /> <!-- started from UsbDeviceSettingsManager --> diff --git a/packages/SystemUI/res/drawable-hdpi/ic_menu_share.png b/packages/SystemUI/res/drawable-hdpi/ic_menu_share.png Binary files differdeleted file mode 100644 index 11ab480..0000000 --- a/packages/SystemUI/res/drawable-hdpi/ic_menu_share.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/ic_menu_share.png b/packages/SystemUI/res/drawable-mdpi/ic_menu_share.png Binary files differdeleted file mode 100644 index 30e69bb..0000000 --- a/packages/SystemUI/res/drawable-mdpi/ic_menu_share.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_menu_share.png b/packages/SystemUI/res/drawable-xhdpi/ic_menu_share.png Binary files differdeleted file mode 100644 index af3e112..0000000 --- a/packages/SystemUI/res/drawable-xhdpi/ic_menu_share.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_menu_share.png b/packages/SystemUI/res/drawable-xxhdpi/ic_menu_share.png Binary files differdeleted file mode 100644 index d450531..0000000 --- a/packages/SystemUI/res/drawable-xxhdpi/ic_menu_share.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable/ic_screenshot_delete.xml b/packages/SystemUI/res/drawable/ic_screenshot_delete.xml new file mode 100644 index 0000000..e35c73d --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_screenshot_delete.xml @@ -0,0 +1,24 @@ +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="32dp" + android:height="32dp" + android:viewportWidth="48.0" + android:viewportHeight="48.0"> + <path + android:fillColor="#FF000000" + android:pathData="M12,38c0,2.21 1.79,4 4,4h16c2.21,0 4,-1.79 4,-4V14H12v24zM38,8h-7l-2,-2H19l-2,2h-7v4h28V8z"/> +</vector> diff --git a/packages/SystemUI/res/drawable/ic_screenshot_share.xml b/packages/SystemUI/res/drawable/ic_screenshot_share.xml new file mode 100644 index 0000000..62733ec --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_screenshot_share.xml @@ -0,0 +1,24 @@ +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="32dp" + android:height="32dp" + android:viewportWidth="48.0" + android:viewportHeight="48.0"> + <path + android:fillColor="#FF000000" + android:pathData="M36,32.17c-1.52,0 -2.89,0.59 -3.93,1.54L17.82,25.4c0.11,-0.45 0.18,-0.92 0.18,-1.4s-0.07,-0.95 -0.18,-1.4l14.1,-8.23c1.07,1 2.5,1.62 4.08,1.62 3.31,0 6,-2.69 6,-6s-2.69,-6 -6,-6 -6,2.69 -6,6c0,0.48 0.07,0.95 0.18,1.4l-14.1,8.23c-1.07,-1 -2.5,-1.62 -4.08,-1.62 -3.31,0 -6,2.69 -6,6s2.69,6 6,6c1.58,0 3.01,-0.62 4.08,-1.62l14.25,8.31c-0.1,0.42 -0.16,0.86 -0.16,1.31 0,3.22 2.61,5.83 5.83,5.83s5.83,-2.61 5.83,-5.83 -2.61,-5.83 -5.83,-5.83z"/> +</vector> diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java index ed954bb..abce31f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java @@ -149,9 +149,10 @@ public class BluetoothTile extends QSTile<QSTile.BooleanState> { private final BluetoothController.Callback mCallback = new BluetoothController.Callback() { @Override - public void onBluetoothStateChange(boolean enabled, boolean connecting) { + public void onBluetoothStateChange(boolean enabled) { refreshState(); } + @Override public void onBluetoothDevicesChanged() { mUiHandler.post(new Runnable() { diff --git a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java index e3fb16a..ca0f357 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java +++ b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java @@ -227,7 +227,7 @@ public class SystemServicesProxy { /** Returns the top task. */ public ActivityManager.RunningTaskInfo getTopMostTask() { List<ActivityManager.RunningTaskInfo> tasks = getRunningTasks(1); - if (!tasks.isEmpty()) { + if (tasks != null && !tasks.isEmpty()) { return tasks.get(0); } return null; diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java index be33085..7e32c3a 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java @@ -137,21 +137,31 @@ class SaveImageInBackgroundTask extends AsyncTask<SaveImageInBackgroundData, Voi int previewWidth = data.previewWidth; int previewHeight = data.previewheight; - final int shortSide = mImageWidth < mImageHeight ? mImageWidth : mImageHeight; - Bitmap preview = Bitmap.createBitmap(previewWidth, previewHeight, data.image.getConfig()); - Canvas c = new Canvas(preview); + Canvas c = new Canvas(); Paint paint = new Paint(); ColorMatrix desat = new ColorMatrix(); desat.setSaturation(0.25f); paint.setColorFilter(new ColorMatrixColorFilter(desat)); Matrix matrix = new Matrix(); - matrix.postTranslate((previewWidth - mImageWidth) / 2, - (previewHeight - mImageHeight) / 2); + int overlayColor = 0x40FFFFFF; + + Bitmap picture = Bitmap.createBitmap(previewWidth, previewHeight, data.image.getConfig()); + matrix.setTranslate((previewWidth - mImageWidth) / 2, (previewHeight - mImageHeight) / 2); + c.setBitmap(picture); c.drawBitmap(data.image, matrix, paint); - c.drawColor(0x40FFFFFF); + c.drawColor(overlayColor); c.setBitmap(null); - Bitmap croppedIcon = Bitmap.createScaledBitmap(preview, iconSize, iconSize, true); + // Note, we can't use the preview for the small icon, since it is non-square + float scale = (float) iconSize / Math.min(mImageWidth, mImageHeight); + Bitmap icon = Bitmap.createBitmap(iconSize, iconSize, data.image.getConfig()); + matrix.setScale(scale, scale); + matrix.postTranslate((iconSize - (scale * mImageWidth)) / 2, + (iconSize - (scale * mImageHeight)) / 2); + c.setBitmap(icon); + c.drawBitmap(data.image, matrix, paint); + c.drawColor(overlayColor); + c.setBitmap(null); // Show the intermediate notification mTickerAddSpace = !mTickerAddSpace; @@ -169,7 +179,7 @@ class SaveImageInBackgroundTask extends AsyncTask<SaveImageInBackgroundData, Voi .setColor(r.getColor(com.android.internal.R.color.system_notification_accent_color)); mNotificationStyle = new Notification.BigPictureStyle() - .bigPicture(preview); + .bigPicture(picture); mNotificationBuilder.setStyle(mNotificationStyle); // For "public" situations we want to show all the same info but @@ -192,7 +202,7 @@ class SaveImageInBackgroundTask extends AsyncTask<SaveImageInBackgroundData, Voi // On the tablet, the large icon makes the notification appear as if it is clickable (and // on small devices, the large icon is not shown) so defer showing the large icon until // we compose the final post-save notification below. - mNotificationBuilder.setLargeIcon(croppedIcon); + mNotificationBuilder.setLargeIcon(icon); // But we still don't set it for the expanded view, allowing the smallIcon to show here. mNotificationStyle.bigLargeIcon((Bitmap) null); } @@ -243,30 +253,39 @@ class SaveImageInBackgroundTask extends AsyncTask<SaveImageInBackgroundData, Voi sharingIntent.putExtra(Intent.EXTRA_STREAM, uri); sharingIntent.putExtra(Intent.EXTRA_SUBJECT, subject); - final PendingIntent callback = PendingIntent.getBroadcast(context, 0, - new Intent(context, GlobalScreenshot.TargetChosenReceiver.class) - .putExtra(GlobalScreenshot.CANCEL_ID, mNotificationId), - PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT); - Intent chooserIntent = Intent.createChooser(sharingIntent, null, - callback.getIntentSender()); - chooserIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK - | Intent.FLAG_ACTIVITY_NEW_TASK); - - mNotificationBuilder.addAction(R.drawable.ic_menu_share, - r.getString(com.android.internal.R.string.share), - PendingIntent.getActivity(context, 0, chooserIntent, - PendingIntent.FLAG_CANCEL_CURRENT)); - OutputStream out = resolver.openOutputStream(uri); image.compress(Bitmap.CompressFormat.PNG, 100, out); out.flush(); out.close(); - // update file size in the database + // Update file size in the database values.clear(); values.put(MediaStore.Images.ImageColumns.SIZE, new File(mImageFilePath).length()); resolver.update(uri, values, null, null); + // Create a share action for the notification + final PendingIntent callback = PendingIntent.getBroadcast(context, 0, + new Intent(context, GlobalScreenshot.TargetChosenReceiver.class) + .putExtra(GlobalScreenshot.CANCEL_ID, mNotificationId), + PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT); + Intent chooserIntent = Intent.createChooser(sharingIntent, null, + callback.getIntentSender()); + chooserIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK + | Intent.FLAG_ACTIVITY_NEW_TASK); + mNotificationBuilder.addAction(R.drawable.ic_screenshot_share, + r.getString(com.android.internal.R.string.share), + PendingIntent.getActivity(context, 0, chooserIntent, + PendingIntent.FLAG_CANCEL_CURRENT)); + + // Create a delete action for the notification + final PendingIntent deleteAction = PendingIntent.getBroadcast(context, 0, + new Intent(context, GlobalScreenshot.DeleteScreenshotReceiver.class) + .putExtra(GlobalScreenshot.CANCEL_ID, mNotificationId) + .putExtra(GlobalScreenshot.SCREENSHOT_URI_ID, uri.toString()), + PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT); + mNotificationBuilder.addAction(R.drawable.ic_screenshot_delete, + r.getString(com.android.internal.R.string.delete), deleteAction); + params[0].imageUri = uri; params[0].image = null; params[0].result = 0; @@ -339,6 +358,29 @@ class SaveImageInBackgroundTask extends AsyncTask<SaveImageInBackgroundData, Voi } /** + * An AsyncTask that deletes an image from the media store in the background. + */ +class DeleteImageInBackgroundTask extends AsyncTask<Uri, Void, Void> { + private static final String TAG = "DeleteImageInBackgroundTask"; + + private Context mContext; + + DeleteImageInBackgroundTask(Context context) { + mContext = context; + } + + @Override + protected Void doInBackground(Uri... params) { + if (params.length != 1) return null; + + Uri screenshotUri = params[0]; + ContentResolver resolver = mContext.getContentResolver(); + resolver.delete(screenshotUri, null, null); + return null; + } +} + +/** * TODO: * - Performance when over gl surfaces? Ie. Gallery * - what do we say in the Toast? Which icon do we get if the user uses another @@ -348,6 +390,7 @@ class GlobalScreenshot { private static final String TAG = "GlobalScreenshot"; static final String CANCEL_ID = "android:cancel_id"; + static final String SCREENSHOT_URI_ID = "android:screenshot_uri_id"; private static final int SCREENSHOT_FLASH_TO_PEAK_DURATION = 130; private static final int SCREENSHOT_DROP_IN_DURATION = 430; @@ -751,11 +794,33 @@ class GlobalScreenshot { return; } + // Clear the notification final NotificationManager nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); + final int id = intent.getIntExtra(CANCEL_ID, 0); + nm.cancel(id); + } + } + + /** + * Removes the last screenshot. + */ + public static class DeleteScreenshotReceiver extends BroadcastReceiver { + @Override + public void onReceive(Context context, Intent intent) { + if (!intent.hasExtra(CANCEL_ID) || !intent.hasExtra(SCREENSHOT_URI_ID)) { + return; + } + // Clear the notification + final NotificationManager nm = + (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); final int id = intent.getIntExtra(CANCEL_ID, 0); + final Uri uri = Uri.parse(intent.getStringExtra(SCREENSHOT_URI_ID)); nm.cancel(id); + + // And delete the image from the media store + new DeleteImageInBackgroundTask(context).execute(uri); } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java index 4f1c652..de42643 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java @@ -115,8 +115,8 @@ public class StatusBarWindowManager { private void applyFocusableFlag(State state) { boolean panelFocusable = state.statusBarFocusable && state.panelExpanded; - if (state.isKeyguardShowingAndNotOccluded() && state.keyguardNeedsInput - && state.bouncerShowing || BaseStatusBar.ENABLE_REMOTE_INPUT && panelFocusable) { + if (state.keyguardShowing && state.keyguardNeedsInput && state.bouncerShowing + || BaseStatusBar.ENABLE_REMOTE_INPUT && panelFocusable) { mLpChanged.flags &= ~WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; mLpChanged.flags &= ~WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM; } else if (state.isKeyguardShowingAndNotOccluded() || panelFocusable) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java index a96f4e9..3b91751 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java @@ -67,8 +67,10 @@ public class StatusBarWindowView extends FrameLayout { || insets.top != getPaddingTop() || insets.right != getPaddingRight() || insets.bottom != getPaddingBottom(); + + // Drop top inset, apply right and left inset and pass through bottom inset. if (changed) { - setPadding(insets.left, insets.top, insets.right, 0); + setPadding(insets.left, 0, insets.right, 0); } insets.left = 0; insets.top = 0; @@ -81,6 +83,7 @@ public class StatusBarWindowView extends FrameLayout { if (changed) { setPadding(0, 0, 0, 0); } + insets.top = 0; } return false; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java index cbe4c4d..8fa9c7e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java @@ -35,7 +35,7 @@ public interface BluetoothController { void disconnect(CachedBluetoothDevice device); public interface Callback { - void onBluetoothStateChange(boolean enabled, boolean connecting); + void onBluetoothStateChange(boolean enabled); void onBluetoothDevicesChanged(); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java index ed98a15..3cc9297 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java @@ -41,7 +41,7 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa private final LocalBluetoothManager mLocalBluetoothManager; private boolean mEnabled; - private boolean mConnecting; + private int mConnectionState = BluetoothAdapter.STATE_DISCONNECTED; private CachedBluetoothDevice mLastDevice; private final H mHandler = new H(); @@ -63,7 +63,7 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa return; } pw.print(" mEnabled="); pw.println(mEnabled); - pw.print(" mConnecting="); pw.println(mConnecting); + pw.print(" mConnectionState="); pw.println(stateToString(mConnectionState)); pw.print(" mLastDevice="); pw.println(mLastDevice); pw.print(" mCallbacks.size="); pw.println(mCallbacks.size()); pw.println(" Bluetooth Devices:"); @@ -73,10 +73,25 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa } } + private static String stateToString(int state) { + switch (state) { + case BluetoothAdapter.STATE_CONNECTED: + return "CONNECTED"; + case BluetoothAdapter.STATE_CONNECTING: + return "CONNECTING"; + case BluetoothAdapter.STATE_DISCONNECTED: + return "DISCONNECTED"; + case BluetoothAdapter.STATE_DISCONNECTING: + return "DISCONNECTING"; + } + return "UNKNOWN(" + state + ")"; + } + private String getDeviceString(CachedBluetoothDevice device) { return device.getName() + " " + device.getBondState() + " " + device.isConnected(); } + @Override public void addStateChangedCallback(Callback cb) { mCallbacks.add(cb); mHandler.sendEmptyMessage(H.MSG_STATE_CHANGED); @@ -94,14 +109,12 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa @Override public boolean isBluetoothConnected() { - return mLocalBluetoothManager != null - && mLocalBluetoothManager.getBluetoothAdapter().getConnectionState() - == BluetoothAdapter.STATE_CONNECTED; + return mConnectionState == BluetoothAdapter.STATE_CONNECTED; } @Override public boolean isBluetoothConnecting() { - return mConnecting; + return mConnectionState == BluetoothAdapter.STATE_CONNECTING; } @Override @@ -190,7 +203,7 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa @Override public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) { - mConnecting = state == BluetoothAdapter.STATE_CONNECTING; + mConnectionState = state; mLastDevice = cachedDevice; updateConnected(); mHandler.sendEmptyMessage(H.MSG_STATE_CHANGED); @@ -225,7 +238,7 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa } private void fireStateChange(BluetoothController.Callback cb) { - cb.onBluetoothStateChange(mEnabled, mConnecting); + cb.onBluetoothStateChange(mEnabled); } } } diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index ff8fb83..63bbf24 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -160,7 +160,7 @@ import libcore.io.IoUtils; public class BackupManagerService { private static final String TAG = "BackupManagerService"; - static final boolean DEBUG = false; + static final boolean DEBUG = true; static final boolean MORE_DEBUG = false; static final boolean DEBUG_SCHEDULING = MORE_DEBUG || true; @@ -1101,7 +1101,7 @@ public class BackupManagerService { if (mPendingInits.size() > 0) { // If there are pending init operations, we process those // and then settle into the usual periodic backup schedule. - if (DEBUG) Slog.v(TAG, "Init pending at scheduled backup"); + if (MORE_DEBUG) Slog.v(TAG, "Init pending at scheduled backup"); try { mAlarmManager.cancel(mRunInitIntent); mRunInitIntent.send(); @@ -1310,7 +1310,7 @@ public class BackupManagerService { for (PackageInfo app : apps) { if (appGetsFullBackup(app) && appIsEligibleForBackup(app.applicationInfo)) { if (!foundApps.contains(app.packageName)) { - if (DEBUG) { + if (MORE_DEBUG) { Slog.i(TAG, "New full backup app " + app.packageName + " found"); } schedule.add(new FullBackupEntry(app.packageName, 0)); @@ -1603,7 +1603,7 @@ public class BackupManagerService { // Maintain persistent state around whether need to do an initialize operation. // Must be called with the queue lock held. void recordInitPendingLocked(boolean isPending, String transportName) { - if (DEBUG) Slog.i(TAG, "recordInitPendingLocked: " + isPending + if (MORE_DEBUG) Slog.i(TAG, "recordInitPendingLocked: " + isPending + " on transport " + transportName); mBackupHandler.removeMessages(MSG_RETRY_INIT); @@ -1731,7 +1731,7 @@ public class BackupManagerService { // ----- Track installation/removal of packages ----- BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { public void onReceive(Context context, Intent intent) { - if (DEBUG) Slog.d(TAG, "Received broadcast " + intent); + if (MORE_DEBUG) Slog.d(TAG, "Received broadcast " + intent); String action = intent.getAction(); boolean replacing = false; @@ -1877,11 +1877,14 @@ public class BackupManagerService { } catch (NameNotFoundException e) { // doesn't really exist; ignore it if (DEBUG) { - Slog.i(TAG, "Can't resolve new app " + packageName); + Slog.w(TAG, "Can't resolve new app " + packageName); } } } + // Whenever a package is added or updated we need to update + // the package metadata bookkeeping. + dataChangedImpl(PACKAGE_MANAGER_SENTINEL); } else { if (replacing) { // The package is being updated. We'll receive a PACKAGE_ADDED shortly. @@ -1957,7 +1960,7 @@ public class BackupManagerService { // Actually bind; presumes that we have already validated the transport service boolean bindTransport(ServiceInfo transport) { ComponentName svcName = new ComponentName(transport.packageName, transport.name); - if (DEBUG) { + if (MORE_DEBUG) { Slog.i(TAG, "Binding to transport host " + svcName); } Intent intent = new Intent(mTransportServiceIntent); @@ -2208,7 +2211,7 @@ public class BackupManagerService { mAgentConnectLock.wait(5000); } catch (InterruptedException e) { // just bail - if (DEBUG) Slog.w(TAG, "Interrupted: " + e); + Slog.w(TAG, "Interrupted: " + e); mActivityManager.clearPendingBackup(); return null; } @@ -2286,9 +2289,13 @@ public class BackupManagerService { long token = mAncestralToken; synchronized (mQueueLock) { if (mEverStoredApps.contains(packageName)) { + if (MORE_DEBUG) { + Slog.i(TAG, "App in ever-stored, so using current token"); + } token = mCurrentToken; } } + if (MORE_DEBUG) Slog.i(TAG, "getAvailableRestoreToken() == " + token); return token; } @@ -2472,6 +2479,20 @@ public class BackupManagerService { // the way. mQueue = (ArrayList<BackupRequest>) mOriginalQueue.clone(); + // The app metadata pseudopackage might also be represented in the + // backup queue if apps have been added/removed since the last time + // we performed a backup. Drop it from the working queue now that + // we're committed to evaluating it for backup regardless. + for (int i = 0; i < mQueue.size(); i++) { + if (PACKAGE_MANAGER_SENTINEL.equals(mQueue.get(i).packageName)) { + if (MORE_DEBUG) { + Slog.i(TAG, "Metadata in queue; eliding"); + } + mQueue.remove(i); + break; + } + } + if (DEBUG) Slog.v(TAG, "Beginning backup of " + mQueue.size() + " targets"); File pmState = new File(mStateDir, PACKAGE_MANAGER_SENTINEL); @@ -2546,7 +2567,7 @@ public class BackupManagerService { // Sanity check that we have work to do. If not, skip to the end where // we reestablish the wakelock invariants etc. if (mQueue.isEmpty()) { - if (DEBUG) Slog.i(TAG, "queue now empty"); + if (MORE_DEBUG) Slog.i(TAG, "queue now empty"); executeNextState(BackupState.FINAL); return; } @@ -2692,7 +2713,7 @@ public class BackupManagerService { if (mStatus == BackupTransport.TRANSPORT_NOT_INITIALIZED) { // Make sure we back up everything and perform the one-time init clearMetadata(); - if (DEBUG) Slog.d(TAG, "Server requires init; rerunning"); + if (MORE_DEBUG) Slog.d(TAG, "Server requires init; rerunning"); addBackupTrace("init required; rerunning"); backupNow(); } @@ -2878,7 +2899,7 @@ public class BackupManagerService { // initiated the appropriate next operation. final String pkg = (mCurrentPackage != null) ? mCurrentPackage.packageName : "[none]"; - if (DEBUG) { + if (MORE_DEBUG) { Slog.i(TAG, "Callback after agent teardown: " + pkg); } addBackupTrace("late opComplete; curPkg = " + pkg); @@ -2967,7 +2988,7 @@ public class BackupManagerService { addBackupTrace("transport rejected package"); } } else { - if (DEBUG) Slog.i(TAG, "no backup data written; not calling transport"); + if (MORE_DEBUG) Slog.i(TAG, "no backup data written; not calling transport"); addBackupTrace("no data to send"); } @@ -3099,7 +3120,7 @@ public class BackupManagerService { } public void establish() { - if (DEBUG) Slog.i(TAG, "Initiating bind of OBB service on " + this); + if (MORE_DEBUG) Slog.i(TAG, "Initiating bind of OBB service on " + this); Intent obbIntent = new Intent().setComponent(new ComponentName( "com.android.sharedstoragebackup", "com.android.sharedstoragebackup.ObbBackupService")); @@ -3155,12 +3176,12 @@ public class BackupManagerService { private void waitForConnection() { synchronized (this) { while (mService == null) { - if (DEBUG) Slog.i(TAG, "...waiting for OBB service binding..."); + if (MORE_DEBUG) Slog.i(TAG, "...waiting for OBB service binding..."); try { this.wait(); } catch (InterruptedException e) { /* never interrupted */ } } - if (DEBUG) Slog.i(TAG, "Connected to OBB service; continuing"); + if (MORE_DEBUG) Slog.i(TAG, "Connected to OBB service; continuing"); } } @@ -3168,7 +3189,7 @@ public class BackupManagerService { public void onServiceConnected(ComponentName name, IBinder service) { synchronized (this) { mService = IObbBackupService.Stub.asInterface(service); - if (DEBUG) Slog.i(TAG, "OBB service connection " + mService + if (MORE_DEBUG) Slog.i(TAG, "OBB service connection " + mService + " connected on " + this); this.notifyAll(); } @@ -3178,7 +3199,7 @@ public class BackupManagerService { public void onServiceDisconnected(ComponentName name) { synchronized (this) { mService = null; - if (DEBUG) Slog.i(TAG, "OBB service connection disconnected on " + this); + if (MORE_DEBUG) Slog.i(TAG, "OBB service connection disconnected on " + this); this.notifyAll(); } } @@ -3356,7 +3377,9 @@ public class BackupManagerService { Slog.e(TAG, "Full backup failed on package " + pkg.packageName); result = BackupTransport.AGENT_ERROR; } else { - if (DEBUG) Slog.d(TAG, "Full package backup success: " + pkg.packageName); + if (MORE_DEBUG) { + Slog.d(TAG, "Full package backup success: " + pkg.packageName); + } } } } catch (IOException e) { @@ -4125,11 +4148,9 @@ public class BackupManagerService { currentPackage.packageName, "transport rejected"); // do nothing, clean up, and continue looping } else if (result != BackupTransport.TRANSPORT_OK) { - if (DEBUG) { - Slog.i(TAG, "Transport failed; aborting backup: " + result); - EventLog.writeEvent(EventLogTags.FULL_BACKUP_TRANSPORT_FAILURE); - return; - } + Slog.w(TAG, "Transport failed; aborting backup: " + result); + EventLog.writeEvent(EventLogTags.FULL_BACKUP_TRANSPORT_FAILURE); + return; } else { // Success! EventLog.writeEvent(EventLogTags.FULL_BACKUP_SUCCESS, @@ -4306,7 +4327,7 @@ public class BackupManagerService { final long timeSinceLast = System.currentTimeMillis() - upcomingLastBackup; final long appLatency = (timeSinceLast < MIN_FULL_BACKUP_INTERVAL) ? (MIN_FULL_BACKUP_INTERVAL - timeSinceLast) : 0; - final long latency = Math.min(transportMinLatency, appLatency); + final long latency = Math.max(transportMinLatency, appLatency); Runnable r = new Runnable() { @Override public void run() { FullBackupJob.schedule(mContext, latency); @@ -4334,9 +4355,6 @@ public class BackupManagerService { for (int i = N-1; i >= 0; i--) { final FullBackupEntry e = mFullBackupQueue.get(i); if (packageName.equals(e.packageName)) { - if (DEBUG) { - Slog.w(TAG, "Removing schedule queue dupe of " + packageName); - } mFullBackupQueue.remove(i); } } @@ -4462,6 +4480,9 @@ public class BackupManagerService { } if (!runBackup) { + if (DEBUG_SCHEDULING) { + Slog.i(TAG, "Nothing pending full backup; rescheduling +" + latency); + } final long deferTime = latency; // pin for the closure mBackupHandler.post(new Runnable() { @Override public void run() { @@ -4809,12 +4830,14 @@ public class BackupManagerService { if (DEBUG) Slog.d(TAG, "Clearing app data preparatory to full restore"); clearApplicationDataSynchronous(pkg); } else { - if (DEBUG) Slog.d(TAG, "backup agent (" + if (MORE_DEBUG) Slog.d(TAG, "backup agent (" + mTargetApp.backupAgentName + ") => no clear"); } mClearedPackages.add(pkg); } else { - if (DEBUG) Slog.d(TAG, "We've initialized this app already; no clear required"); + if (MORE_DEBUG) { + Slog.d(TAG, "We've initialized this app already; no clear required"); + } } // All set; now set up the IPC and launch the agent @@ -4829,7 +4852,7 @@ public class BackupManagerService { } if (mAgent == null) { - if (DEBUG) Slog.d(TAG, "Unable to create agent for " + pkg); + Slog.e(TAG, "Unable to create agent for " + pkg); okay = false; tearDownPipes(); mPackagePolicies.put(pkg, RestorePolicy.IGNORE); @@ -4861,7 +4884,7 @@ public class BackupManagerService { info.size, info.type, info.path, info.mode, info.mtime, token, mBackupManagerBinder); } else { - if (DEBUG) Slog.d(TAG, "Invoking agent to restore file " + if (MORE_DEBUG) Slog.d(TAG, "Invoking agent to restore file " + info.path); // fire up the app's agent listening on the socket. If // the agent is running in the system process we can't @@ -4932,9 +4955,7 @@ public class BackupManagerService { // okay, if the remote end failed at any point, deal with // it by ignoring the rest of the restore on it if (!agentSuccess) { - if (DEBUG) { - Slog.i(TAG, "Agent failure; ending restore"); - } + Slog.w(TAG, "Agent failure; ending restore"); mBackupHandler.removeMessages(MSG_TIMEOUT); tearDownPipes(); tearDownAgent(mTargetApp); @@ -4955,7 +4976,7 @@ public class BackupManagerService { // dropped file, or an already-ignored package: skip to the // next stream entry by reading and discarding this file. if (!okay) { - if (DEBUG) Slog.d(TAG, "[discarding file content]"); + if (MORE_DEBUG) Slog.d(TAG, "[discarding file content]"); long bytesToConsume = (info.size + 511) & ~511; while (bytesToConsume > 0) { int toRead = (bytesToConsume > mBuffer.length) @@ -5015,10 +5036,10 @@ public class BackupManagerService { // manifest flag! TODO something less direct. if (app.uid != Process.SYSTEM_UID && !app.packageName.equals("com.android.backupconfirm")) { - if (DEBUG) Slog.d(TAG, "Killing host process"); + if (MORE_DEBUG) Slog.d(TAG, "Killing host process"); mActivityManager.killApplicationProcess(app.processName, app.uid); } else { - if (DEBUG) Slog.d(TAG, "Not killing after full restore"); + if (MORE_DEBUG) Slog.d(TAG, "Not killing after full restore"); } } catch (RemoteException e) { Slog.d(TAG, "Lost app trying to shut down"); @@ -5436,7 +5457,7 @@ public class BackupManagerService { } void dumpFileMetadata(FileMetadata info) { - if (DEBUG) { + if (MORE_DEBUG) { StringBuilder b = new StringBuilder(128); // mode string @@ -5513,7 +5534,7 @@ public class BackupManagerService { } case 0: { // presume EOF - if (DEBUG) Slog.w(TAG, "Saw type=0 in tar header block, info=" + info); + if (MORE_DEBUG) Slog.w(TAG, "Saw type=0 in tar header block, info=" + info); return null; } default: { @@ -5561,7 +5582,9 @@ public class BackupManagerService { } catch (IOException e) { if (DEBUG) { Slog.e(TAG, "Parse error in header: " + e.getMessage()); - HEXLOG(block); + if (MORE_DEBUG) { + HEXLOG(block); + } } throw e; } @@ -7067,7 +7090,7 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF // partition will be signed with the device's platform certificate, so on // different phones the same system app will have different signatures.) if ((target.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) { - if (DEBUG) Slog.v(TAG, "System app " + target.packageName + " - skipping sig check"); + if (MORE_DEBUG) Slog.v(TAG, "System app " + target.packageName + " - skipping sig check"); return true; } @@ -7138,7 +7161,7 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF // partition will be signed with the device's platform certificate, so on // different phones the same system app will have different signatures.) if ((target.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) { - if (DEBUG) Slog.v(TAG, "System app " + target.packageName + " - skipping sig check"); + if (MORE_DEBUG) Slog.v(TAG, "System app " + target.packageName + " - skipping sig check"); return true; } @@ -7290,7 +7313,7 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF PackageManagerBackupAgent.getStorableApplications(mPackageManager); filterSet = packagesToNames(apps); if (DEBUG) { - Slog.i(TAG, "Full restore; asking for " + filterSet.length + " apps"); + Slog.i(TAG, "Full restore; asking about " + filterSet.length + " apps"); } } @@ -7584,7 +7607,7 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF } } - if (DEBUG) Slog.v(TAG, "Package " + pkgName + if (MORE_DEBUG) Slog.v(TAG, "Package " + pkgName + " restore version [" + metaInfo.versionCode + "] is compatible with installed version [" + mCurrentPackage.versionCode + "]"); @@ -7622,7 +7645,7 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF // only to the key/value restore API flow if (mCurrentPackage.applicationInfo.backupAgentName == null || "".equals(mCurrentPackage.applicationInfo.backupAgentName)) { - if (DEBUG) { + if (MORE_DEBUG) { Slog.i(TAG, "Data exists for package " + packageName + " but app has no agent; skipping"); } @@ -7693,7 +7716,7 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF ParcelFileDescriptor.MODE_TRUNCATE); if (!SELinux.restorecon(mBackupDataName)) { - Slog.e(TAG, "SElinux restorecon failed for " + downloadFile); + if (MORE_DEBUG) Slog.e(TAG, "SElinux restorecon failed for " + downloadFile); } if (mTransport.getRestoreData(stage) != BackupTransport.TRANSPORT_OK) { @@ -7789,7 +7812,7 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF // backup looper, and the overall unified restore task resumes try { StreamFeederThread feeder = new StreamFeederThread(); - if (DEBUG) { + if (MORE_DEBUG) { Slog.i(TAG, "Spinning threads for stream restore of " + mCurrentPackage.packageName); } @@ -8307,8 +8330,7 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF } // do this via another alarm to make sure of the wakelock states long delay = transport.requestBackupTime(); - if (DEBUG) Slog.w(TAG, "init failed on " - + transportName + " resched in " + delay); + Slog.w(TAG, "Init failed on " + transportName + " resched in " + delay); mAlarmManager.set(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + delay, mRunInitIntent); } @@ -8346,20 +8368,12 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF // one already there, then overwrite it, but no harm done. BackupRequest req = new BackupRequest(packageName); if (mPendingBackups.put(packageName, req) == null) { - if (DEBUG) Slog.d(TAG, "Now staging backup of " + packageName); + if (MORE_DEBUG) Slog.d(TAG, "Now staging backup of " + packageName); // Journal this request in case of crash. The put() // operation returned null when this package was not already // in the set; we want to avoid touching the disk redundantly. writeToJournalLocked(packageName); - - if (MORE_DEBUG) { - int numKeys = mPendingBackups.size(); - Slog.d(TAG, "Now awaiting backup for " + numKeys + " participants:"); - for (BackupRequest b : mPendingBackups.values()) { - Slog.d(TAG, " + " + b); - } - } } } } @@ -8380,14 +8394,17 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF } // a caller with full permission can ask to back up any participating app - // !!! TODO: allow backup of ANY app? HashSet<String> targets = new HashSet<String>(); - synchronized (mBackupParticipants) { - int N = mBackupParticipants.size(); - for (int i = 0; i < N; i++) { - HashSet<String> s = mBackupParticipants.valueAt(i); - if (s != null) { - targets.addAll(s); + if (PACKAGE_MANAGER_SENTINEL.equals(packageName)) { + targets.add(PACKAGE_MANAGER_SENTINEL); + } else { + synchronized (mBackupParticipants) { + int N = mBackupParticipants.size(); + for (int i = 0; i < N; i++) { + HashSet<String> s = mBackupParticipants.valueAt(i); + if (s != null) { + targets.addAll(s); + } } } } @@ -8458,7 +8475,7 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF } else { // a caller with full permission can ask to back up any participating app // !!! TODO: allow data-clear of ANY app? - if (DEBUG) Slog.v(TAG, "Privileged caller, allowing clear of other apps"); + if (MORE_DEBUG) Slog.v(TAG, "Privileged caller, allowing clear of other apps"); apps = new HashSet<String>(); int N = mBackupParticipants.size(); for (int i = 0; i < N; i++) { @@ -8472,7 +8489,7 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF // Is the given app an available participant? if (apps.contains(packageName)) { // found it; fire off the clear request - if (DEBUG) Slog.v(TAG, "Found the app - running clear process"); + if (MORE_DEBUG) Slog.v(TAG, "Found the app - running clear process"); mBackupHandler.removeMessages(MSG_RETRY_CLEAR); synchronized (mQueueLock) { final IBackupTransport transport = getTransport(transportName); @@ -8764,7 +8781,7 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF params.encryptPassword = encPpassword; - if (DEBUG) Slog.d(TAG, "Sending conf message with verb " + verb); + if (MORE_DEBUG) Slog.d(TAG, "Sending conf message with verb " + verb); mWakelock.acquire(); Message msg = mBackupHandler.obtainMessage(verb, params); mBackupHandler.sendMessage(msg); @@ -8805,7 +8822,7 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF scheduleNextFullBackupJob(0); } else if (!enable) { // No longer enabled, so stop running backups - if (DEBUG) Slog.i(TAG, "Opting out of backup"); + if (MORE_DEBUG) Slog.i(TAG, "Opting out of backup"); KeyValueBackupJob.cancel(mContext); @@ -9613,6 +9630,9 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF } } + pw.print("Ancestral: "); pw.println(Long.toHexString(mAncestralToken)); + pw.print("Current: "); pw.println(Long.toHexString(mCurrentToken)); + int N = mBackupParticipants.size(); pw.println("Participants:"); for (int i=0; i<N; i++) { diff --git a/services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java b/services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java index 4f7e57f..f197c1e 100644 --- a/services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java +++ b/services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java @@ -324,14 +324,18 @@ public class PackageManagerBackupAgent extends BackupAgent { // At this point, the only entries in 'existing' are apps that were // mentioned in the saved state file, but appear to no longer be present - // on the device. Write a deletion entity for them. - for (String app : mExisting) { - if (DEBUG) Slog.v(TAG, "- removing metadata for deleted pkg " + app); - try { - data.writeEntityHeader(app, -1); - } catch (IOException e) { - Slog.e(TAG, "Unable to write package deletions!"); - return; + // on the device. We want to preserve the entry for them, however, + // because we want the right thing to happen if the user goes through + // a backup / uninstall / backup / reinstall sequence. + if (DEBUG) { + if (mExisting.size() > 0) { + StringBuilder sb = new StringBuilder(64); + sb.append("Preserving metadata for deleted packages:"); + for (String app : mExisting) { + sb.append(' '); + sb.append(app); + } + Slog.v(TAG, sb.toString()); } } } catch (IOException e) { diff --git a/services/core/java/com/android/server/EventLogTags.logtags b/services/core/java/com/android/server/EventLogTags.logtags index 4b65dec..c01d816 100644 --- a/services/core/java/com/android/server/EventLogTags.logtags +++ b/services/core/java/com/android/server/EventLogTags.logtags @@ -66,13 +66,13 @@ option java_package com.android.server # when notifications are newly displayed on screen, or disappear from screen 27510 notification_visibility_changed (newlyVisibleKeys|3),(noLongerVisibleKeys|3) # when notifications are expanded, or contracted -27511 notification_expansion (key|3),(user_action|1),(expanded|1) +27511 notification_expansion (key|3),(user_action|1),(expanded|1),(lifespan|1),(freshness|1),(exposure|1) # when a notification has been clicked -27520 notification_clicked (key|3) +27520 notification_clicked (key|3),(lifespan|1),(freshness|1),(exposure|1) # when a notification action button has been clicked -27521 notification_action_clicked (key|3),(action_index|1) +27521 notification_action_clicked (key|3),(action_index|1),(lifespan|1),(freshness|1),(exposure|1) # when a notification has been canceled -27530 notification_canceled (key|3),(reason|1),(lifespan|1),(exposure|1) +27530 notification_canceled (key|3),(reason|1),(lifespan|1),(freshness|1),(exposure|1) # replaces 27510 with a row per notification 27531 notification_visibility (key|3),(visibile|1),(lifespan|1),(freshness|1) diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java index 1f6c473..ab0c8a9 100644 --- a/services/core/java/com/android/server/InputMethodManagerService.java +++ b/services/core/java/com/android/server/InputMethodManagerService.java @@ -675,6 +675,10 @@ public class InputMethodManagerService extends IInputMethodManager.Stub // We currently don't have a default input method... is // one now available? changed = chooseNewDefaultIMELocked(); + } else if (!changed && isPackageModified(curIm.getPackageName())) { + // Even if the current input method is still available, mCurrentSubtype could + // be obsolete when the package is modified in practice. + changed = true; } if (changed) { diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java index 2df7f79..f6ca0d7 100644 --- a/services/core/java/com/android/server/LockSettingsService.java +++ b/services/core/java/com/android/server/LockSettingsService.java @@ -25,11 +25,9 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; import android.content.pm.UserInfo; - import static android.Manifest.permission.ACCESS_KEYGUARD_SECURE_STORAGE; import static android.content.Context.USER_SERVICE; import static android.Manifest.permission.READ_PROFILE; - import android.database.sqlite.SQLiteDatabase; import android.os.Binder; import android.os.IBinder; @@ -44,6 +42,7 @@ import android.provider.Settings; import android.provider.Settings.Secure; import android.provider.Settings.SettingNotFoundException; import android.security.KeyStore; +import android.service.gatekeeper.GateKeeperResponse; import android.service.gatekeeper.IGateKeeperService; import android.text.TextUtils; import android.util.Slog; @@ -51,6 +50,7 @@ import android.util.Slog; import com.android.internal.util.ArrayUtils; import com.android.internal.widget.ILockSettings; import com.android.internal.widget.LockPatternUtils; +import com.android.internal.widget.VerifyCredentialResponse; import com.android.server.LockSettingsStorage.CredentialHash; import java.util.Arrays; @@ -76,6 +76,12 @@ public class LockSettingsService extends ILockSettings.Stub { private boolean mFirstCallToVold; private IGateKeeperService mGateKeeperService; + private interface CredentialUtil { + void setCredential(String credential, String savedCredential, int userId) + throws RemoteException; + byte[] toHash(String credential, int userId); + } + public LockSettingsService(Context context) { mContext = context; // Open the database @@ -468,155 +474,163 @@ public class LockSettingsService extends ILockSettings.Stub { byte[] toEnrollBytes = toEnroll == null ? null : toEnroll.getBytes(); - byte[] hash = getGateKeeperService().enroll(userId, enrolledHandle, enrolledCredentialBytes, - toEnrollBytes); + GateKeeperResponse response = getGateKeeperService().enroll(userId, enrolledHandle, + enrolledCredentialBytes, toEnrollBytes); + if (response == null) { + return null; + } + + byte[] hash = response.getPayload(); if (hash != null) { setKeystorePassword(toEnroll, userId); + } else { + // Should not happen + Slog.e(TAG, "Throttled while enrolling a password"); } - return hash; } @Override - public boolean checkPattern(String pattern, int userId) throws RemoteException { - try { - doVerifyPattern(pattern, false, 0, userId); - } catch (VerificationFailedException ex) { - return false; - } - - return true; + public VerifyCredentialResponse checkPattern(String pattern, int userId) throws RemoteException { + return doVerifyPattern(pattern, false, 0, userId); } @Override - public byte[] verifyPattern(String pattern, long challenge, int userId) + public VerifyCredentialResponse verifyPattern(String pattern, long challenge, int userId) throws RemoteException { - try { - return doVerifyPattern(pattern, true, challenge, userId); - } catch (VerificationFailedException ex) { - return null; - } + return doVerifyPattern(pattern, true, challenge, userId); } - private byte[] doVerifyPattern(String pattern, boolean hasChallenge, long challenge, - int userId) throws VerificationFailedException, RemoteException { + private VerifyCredentialResponse doVerifyPattern(String pattern, boolean hasChallenge, long challenge, + int userId) throws RemoteException { checkPasswordReadPermission(userId); - CredentialHash storedHash = mStorage.readPatternHash(userId); - - if ((storedHash == null || storedHash.hash.length == 0) && TextUtils.isEmpty(pattern)) { - // don't need to pass empty passwords to GateKeeper - return null; - } - - if (TextUtils.isEmpty(pattern)) { - throw new VerificationFailedException(); - } - - if (storedHash.version == CredentialHash.VERSION_LEGACY) { - byte[] hash = mLockPatternUtils.patternToHash( - mLockPatternUtils.stringToPattern(pattern)); - if (Arrays.equals(hash, storedHash.hash)) { - unlockKeystore(pattern, userId); - // migrate password to GateKeeper - setLockPattern(pattern, null, userId); - if (!hasChallenge) { - return null; - } - // Fall through to get the auth token. Technically this should never happen, - // as a user that had a legacy pattern would have to unlock their device - // before getting to a flow with a challenge, but supporting for consistency. - } else { - throw new VerificationFailedException(); - } - } - - byte[] token = null; - if (hasChallenge) { - token = getGateKeeperService() - .verifyChallenge(userId, challenge, storedHash.hash, pattern.getBytes()); - if (token == null) { - throw new VerificationFailedException(); - } - } else if (!getGateKeeperService().verify(userId, storedHash.hash, pattern.getBytes())) { - throw new VerificationFailedException(); - } - - // pattern has matched - unlockKeystore(pattern, userId); - return token; - + return verifyCredential(userId, storedHash, pattern, hasChallenge, + challenge, + new CredentialUtil() { + @Override + public void setCredential(String pattern, String oldPattern, int userId) + throws RemoteException { + setLockPattern(pattern, oldPattern, userId); + } + + @Override + public byte[] toHash(String pattern, int userId) { + return mLockPatternUtils.patternToHash( + mLockPatternUtils.stringToPattern(pattern)); + } + } + ); } @Override - public boolean checkPassword(String password, int userId) throws RemoteException { - try { - doVerifyPassword(password, false, 0, userId); - } catch (VerificationFailedException ex) { - return false; - } - return true; + public VerifyCredentialResponse checkPassword(String password, int userId) + throws RemoteException { + return doVerifyPassword(password, false, 0, userId); } @Override - public byte[] verifyPassword(String password, long challenge, int userId) + public VerifyCredentialResponse verifyPassword(String password, long challenge, int userId) throws RemoteException { - try { - return doVerifyPassword(password, true, challenge, userId); - } catch (VerificationFailedException ex) { - return null; - } + return doVerifyPassword(password, true, challenge, userId); } - private byte[] doVerifyPassword(String password, boolean hasChallenge, long challenge, - int userId) throws VerificationFailedException, RemoteException { + private VerifyCredentialResponse doVerifyPassword(String password, boolean hasChallenge, + long challenge, int userId) throws RemoteException { checkPasswordReadPermission(userId); - CredentialHash storedHash = mStorage.readPasswordHash(userId); + return verifyCredential(userId, storedHash, password, hasChallenge, challenge, + new CredentialUtil() { + @Override + public void setCredential(String password, String oldPassword, int userId) + throws RemoteException { + setLockPassword(password, oldPassword, userId); + } - if ((storedHash == null || storedHash.hash.length == 0) && TextUtils.isEmpty(password)) { - // don't need to pass empty passwords to GateKeeper - return null; + @Override + public byte[] toHash(String password, int userId) { + return mLockPatternUtils.passwordToHash(password, userId); + } + } + ); + } + + private VerifyCredentialResponse verifyCredential(int userId, CredentialHash storedHash, + String credential, boolean hasChallenge, long challenge, CredentialUtil credentialUtil) + throws RemoteException { + if ((storedHash == null || storedHash.hash.length == 0) && TextUtils.isEmpty(credential)) { + // don't need to pass empty credentials to GateKeeper + return VerifyCredentialResponse.OK; } - if (TextUtils.isEmpty(password)) { - throw new VerificationFailedException(); + if (TextUtils.isEmpty(credential)) { + return VerifyCredentialResponse.ERROR; } if (storedHash.version == CredentialHash.VERSION_LEGACY) { - byte[] hash = mLockPatternUtils.passwordToHash(password, userId); + byte[] hash = credentialUtil.toHash(credential, userId); if (Arrays.equals(hash, storedHash.hash)) { - unlockKeystore(password, userId); - // migrate password to GateKeeper - setLockPassword(password, null, userId); + unlockKeystore(credential, userId); + // migrate credential to GateKeeper + credentialUtil.setCredential(credential, null, userId); if (!hasChallenge) { - return null; + return VerifyCredentialResponse.OK; } // Fall through to get the auth token. Technically this should never happen, - // as a user that had a legacy password would have to unlock their device + // as a user that had a legacy credential would have to unlock their device // before getting to a flow with a challenge, but supporting for consistency. } else { - throw new VerificationFailedException(); + return VerifyCredentialResponse.ERROR; } } - byte[] token = null; + VerifyCredentialResponse response; + boolean shouldReEnroll = false;; if (hasChallenge) { - token = getGateKeeperService() - .verifyChallenge(userId, challenge, storedHash.hash, password.getBytes()); - if (token == null) { - throw new VerificationFailedException(); + byte[] token = null; + GateKeeperResponse gateKeeperResponse = getGateKeeperService() + .verifyChallenge(userId, challenge, storedHash.hash, credential.getBytes()); + int responseCode = gateKeeperResponse.getResponseCode(); + if (responseCode == GateKeeperResponse.RESPONSE_RETRY) { + response = new VerifyCredentialResponse(gateKeeperResponse.getTimeout()); + } else if (responseCode == GateKeeperResponse.RESPONSE_OK) { + token = gateKeeperResponse.getPayload(); + if (token == null) { + // something's wrong if there's no payload with a challenge + Slog.e(TAG, "verifyChallenge response had no associated payload"); + response = VerifyCredentialResponse.ERROR; + } else { + shouldReEnroll = gateKeeperResponse.getShouldReEnroll(); + response = new VerifyCredentialResponse(token); + } + } else { + response = VerifyCredentialResponse.ERROR; + } + } else { + GateKeeperResponse gateKeeperResponse = getGateKeeperService().verify( + userId, storedHash.hash, credential.getBytes()); + int responseCode = gateKeeperResponse.getResponseCode(); + if (responseCode == GateKeeperResponse.RESPONSE_RETRY) { + response = new VerifyCredentialResponse(gateKeeperResponse.getTimeout()); + } else if (responseCode == GateKeeperResponse.RESPONSE_OK) { + shouldReEnroll = gateKeeperResponse.getShouldReEnroll(); + response = VerifyCredentialResponse.OK; + } else { + response = VerifyCredentialResponse.ERROR; } - } else if (!getGateKeeperService().verify(userId, storedHash.hash, password.getBytes())) { - throw new VerificationFailedException(); } - // password has matched - unlockKeystore(password, userId); - return token; - } + if (response.getResponseCode() == VerifyCredentialResponse.RESPONSE_OK) { + // credential has matched + unlockKeystore(credential, userId); + if (shouldReEnroll) { + credentialUtil.setCredential(credential, credential, userId); + } + } + return response; + } @Override public boolean checkVoldPassword(int userId) throws RemoteException { @@ -644,7 +658,8 @@ public class LockSettingsService extends ILockSettings.Stub { try { if (mLockPatternUtils.isLockPatternEnabled(userId)) { - if (checkPattern(password, userId)) { + if (checkPattern(password, userId).getResponseCode() + == GateKeeperResponse.RESPONSE_OK) { return true; } } @@ -653,7 +668,8 @@ public class LockSettingsService extends ILockSettings.Stub { try { if (mLockPatternUtils.isLockPasswordEnabled(userId)) { - if (checkPassword(password, userId)) { + if (checkPassword(password, userId).getResponseCode() + == GateKeeperResponse.RESPONSE_OK) { return true; } } @@ -741,6 +757,4 @@ public class LockSettingsService extends ILockSettings.Stub { return null; } - private class VerificationFailedException extends Exception {} - } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index e63be92..6e1b434 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -55,6 +55,7 @@ import android.graphics.Rect; import android.os.BatteryStats; import android.os.PersistableBundle; import android.os.PowerManager; +import android.os.Trace; import android.os.TransactionTooLargeException; import android.os.WorkSource; import android.os.storage.IMountService; @@ -3284,12 +3285,15 @@ public final class ActivityManagerService extends ActivityManagerNative // the PID of the new process, or else throw a RuntimeException. boolean isActivityProcess = (entryPoint == null); if (entryPoint == null) entryPoint = "android.app.ActivityThread"; + Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "Start proc: " + + app.processName); checkTime(startTime, "startProcess: asking zygote to start proc"); Process.ProcessStartResult startResult = Process.start(entryPoint, app.processName, uid, uid, gids, debugFlags, mountExternal, app.info.targetSdkVersion, app.info.seinfo, requiredAbi, instructionSet, app.info.dataDir, entryPointArgs); checkTime(startTime, "startProcess: returned from zygote!"); + Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER); if (app.isolated) { mBatteryStatsService.addIsolatedUid(app.uid, app.info.uid); @@ -3427,7 +3431,8 @@ public final class ActivityManagerService extends ActivityManagerNative if (preferredComponent != null) { ai = AppGlobals.getPackageManager().getActivityInfo( preferredComponent, flags, userId); - } else { + } + if (ai == null) { ResolveInfo info = AppGlobals.getPackageManager().resolveIntent( intent, intent.resolveTypeIfNeeded(mContext.getContentResolver()), diff --git a/services/core/java/com/android/server/location/GpsLocationProvider.java b/services/core/java/com/android/server/location/GpsLocationProvider.java index d338d91..3850306 100644 --- a/services/core/java/com/android/server/location/GpsLocationProvider.java +++ b/services/core/java/com/android/server/location/GpsLocationProvider.java @@ -454,6 +454,7 @@ public class GpsLocationProvider implements LocationProviderInterface { updateNetworkState(networkState, info); } else if (PowerManager.ACTION_POWER_SAVE_MODE_CHANGED.equals(action) + || PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED.equals(action) || Intent.ACTION_SCREEN_OFF.equals(action) || Intent.ACTION_SCREEN_ON.equals(action)) { updateLowPowerMode(); @@ -501,14 +502,14 @@ public class GpsLocationProvider implements LocationProviderInterface { } private void updateLowPowerMode() { - final boolean disableGps; + // Disable GPS if we are in device idle mode. + boolean disableGps = mPowerManager.isDeviceIdleMode(); switch (Settings.Secure.getInt(mContext.getContentResolver(), BATTERY_SAVER_GPS_MODE, BATTERY_SAVER_MODE_DISABLED_WHEN_SCREEN_OFF)) { case BATTERY_SAVER_MODE_DISABLED_WHEN_SCREEN_OFF: - disableGps = mPowerManager.isPowerSaveMode() && !mPowerManager.isInteractive(); + // If we are in battery saver mode and the screen is off, disable GPS. + disableGps |= mPowerManager.isPowerSaveMode() && !mPowerManager.isInteractive(); break; - default: - disableGps = false; } if (disableGps != mDisableGps) { mDisableGps = disableGps; @@ -2034,6 +2035,7 @@ public class GpsLocationProvider implements LocationProviderInterface { intentFilter.addAction(ALARM_TIMEOUT); intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION); intentFilter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED); + intentFilter.addAction(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED); intentFilter.addAction(Intent.ACTION_SCREEN_OFF); intentFilter.addAction(Intent.ACTION_SCREEN_ON); intentFilter.addAction(SIM_STATE_CHANGED); diff --git a/services/core/java/com/android/server/notification/ConditionProviders.java b/services/core/java/com/android/server/notification/ConditionProviders.java index 33c666a..40956c1 100644 --- a/services/core/java/com/android/server/notification/ConditionProviders.java +++ b/services/core/java/com/android/server/notification/ConditionProviders.java @@ -262,6 +262,14 @@ public class ConditionProviders extends ManagedServices { return null; } + public Condition findCondition(ComponentName component, Uri conditionId) { + if (component == null || conditionId == null) return null; + synchronized (mMutex) { + final ConditionRecord r = getRecordLocked(conditionId, component, false /*create*/); + return r != null ? r.condition : null; + } + } + public void ensureRecordExists(ComponentName component, Uri conditionId, IConditionProvider provider) { // constructed by convention, make sure the record exists... diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 2be409a..2d15d13 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -36,6 +36,7 @@ import android.app.NotificationManager; import android.app.NotificationManager.Policy; import android.app.PendingIntent; import android.app.StatusBarManager; +import android.app.backup.BackupManager; import android.app.usage.UsageEvents; import android.app.usage.UsageStatsManagerInternal; import android.content.BroadcastReceiver; @@ -113,12 +114,16 @@ import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlSerializer; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileDescriptor; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.io.PrintWriter; import java.nio.charset.StandardCharsets; import java.util.ArrayDeque; @@ -126,7 +131,6 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; import java.util.Map.Entry; -import java.util.NoSuchElementException; import java.util.Objects; /** {@hide} */ @@ -244,15 +248,18 @@ public class NotificationManagerService extends SystemService { private Archive mArchive; - // Notification control database. For now just contains disabled packages. + // Persistent storage for notification policy private AtomicFile mPolicyFile; + + // Temporary holder for <blocked-packages> config coming from old policy files. private HashSet<String> mBlockedPackages = new HashSet<String>(); private static final int DB_VERSION = 1; - private static final String TAG_BODY = "notification-policy"; + private static final String TAG_NOTIFICATION_POLICY = "notification-policy"; private static final String ATTR_VERSION = "version"; + // Obsolete: converted if present, but not resaved to disk. private static final String TAG_BLOCKED_PKGS = "blocked-packages"; private static final String TAG_PACKAGE = "package"; private static final String ATTR_NAME = "name"; @@ -310,53 +317,9 @@ public class NotificationManagerService extends SystemService { mBuffer.addLast(nr.cloneLight()); } - public void clear() { - mBuffer.clear(); - } - public Iterator<StatusBarNotification> descendingIterator() { return mBuffer.descendingIterator(); } - public Iterator<StatusBarNotification> ascendingIterator() { - return mBuffer.iterator(); - } - public Iterator<StatusBarNotification> filter( - final Iterator<StatusBarNotification> iter, final String pkg, final int userId) { - return new Iterator<StatusBarNotification>() { - StatusBarNotification mNext = findNext(); - - private StatusBarNotification findNext() { - while (iter.hasNext()) { - StatusBarNotification nr = iter.next(); - if ((pkg == null || nr.getPackageName() == pkg) - && (userId == UserHandle.USER_ALL || nr.getUserId() == userId)) { - return nr; - } - } - return null; - } - - @Override - public boolean hasNext() { - return mNext == null; - } - - @Override - public StatusBarNotification next() { - StatusBarNotification next = mNext; - if (next == null) { - throw new NoSuchElementException(); - } - mNext = findNext(); - return next; - } - - @Override - public void remove() { - iter.remove(); - } - }; - } public StatusBarNotification[] getArray(int count) { if (count == 0) count = mBufferSize; @@ -370,54 +333,48 @@ public class NotificationManagerService extends SystemService { return a; } - public StatusBarNotification[] getArray(int count, String pkg, int userId) { - if (count == 0) count = mBufferSize; - final StatusBarNotification[] a - = new StatusBarNotification[Math.min(count, mBuffer.size())]; - Iterator<StatusBarNotification> iter = filter(descendingIterator(), pkg, userId); - int i=0; - while (iter.hasNext() && i < count) { - a[i++] = iter.next(); + } + + private void readPolicyXml(InputStream stream, boolean forRestore) + throws XmlPullParserException, NumberFormatException, IOException { + final XmlPullParser parser = Xml.newPullParser(); + parser.setInput(stream, StandardCharsets.UTF_8.name()); + + int type; + String tag; + int version = DB_VERSION; + while ((type = parser.next()) != END_DOCUMENT) { + tag = parser.getName(); + if (type == START_TAG) { + if (TAG_NOTIFICATION_POLICY.equals(tag)) { + version = Integer.parseInt( + parser.getAttributeValue(null, ATTR_VERSION)); + } else if (TAG_BLOCKED_PKGS.equals(tag)) { + while ((type = parser.next()) != END_DOCUMENT) { + tag = parser.getName(); + if (TAG_PACKAGE.equals(tag)) { + mBlockedPackages.add( + parser.getAttributeValue(null, ATTR_NAME)); + } else if (TAG_BLOCKED_PKGS.equals(tag) && type == END_TAG) { + break; + } + } + } } - return a; + mZenModeHelper.readXml(parser, forRestore); + mRankingHelper.readXml(parser, forRestore); } - } private void loadPolicyFile() { + if (DBG) Slog.d(TAG, "loadPolicyFile"); synchronized(mPolicyFile) { mBlockedPackages.clear(); FileInputStream infile = null; try { infile = mPolicyFile.openRead(); - final XmlPullParser parser = Xml.newPullParser(); - parser.setInput(infile, StandardCharsets.UTF_8.name()); - - int type; - String tag; - int version = DB_VERSION; - while ((type = parser.next()) != END_DOCUMENT) { - tag = parser.getName(); - if (type == START_TAG) { - if (TAG_BODY.equals(tag)) { - version = Integer.parseInt( - parser.getAttributeValue(null, ATTR_VERSION)); - } else if (TAG_BLOCKED_PKGS.equals(tag)) { - while ((type = parser.next()) != END_DOCUMENT) { - tag = parser.getName(); - if (TAG_PACKAGE.equals(tag)) { - mBlockedPackages.add( - parser.getAttributeValue(null, ATTR_NAME)); - } else if (TAG_BLOCKED_PKGS.equals(tag) && type == END_TAG) { - break; - } - } - } - } - mZenModeHelper.readXml(parser); - mRankingHelper.readXml(parser); - } + readPolicyXml(infile, false /*forRestore*/); } catch (FileNotFoundException e) { // No data yet } catch (IOException e) { @@ -438,7 +395,7 @@ public class NotificationManagerService extends SystemService { } private void handleSavePolicyFile() { - Slog.d(TAG, "handleSavePolicyFile"); + if (DBG) Slog.d(TAG, "handleSavePolicyFile"); synchronized (mPolicyFile) { final FileOutputStream stream; try { @@ -449,21 +406,26 @@ public class NotificationManagerService extends SystemService { } try { - final XmlSerializer out = new FastXmlSerializer(); - out.setOutput(stream, StandardCharsets.UTF_8.name()); - out.startDocument(null, true); - out.startTag(null, TAG_BODY); - out.attribute(null, ATTR_VERSION, Integer.toString(DB_VERSION)); - mZenModeHelper.writeXml(out); - mRankingHelper.writeXml(out); - out.endTag(null, TAG_BODY); - out.endDocument(); + writePolicyXml(stream, false /*forBackup*/); mPolicyFile.finishWrite(stream); } catch (IOException e) { Slog.w(TAG, "Failed to save policy file, restoring backup", e); mPolicyFile.failWrite(stream); } } + BackupManager.dataChanged(getContext().getPackageName()); + } + + private void writePolicyXml(OutputStream stream, boolean forBackup) throws IOException { + final XmlSerializer out = new FastXmlSerializer(); + out.setOutput(stream, StandardCharsets.UTF_8.name()); + out.startDocument(null, true); + out.startTag(null, TAG_NOTIFICATION_POLICY); + out.attribute(null, ATTR_VERSION, Integer.toString(DB_VERSION)); + mZenModeHelper.writeXml(out, forBackup); + mRankingHelper.writeXml(out, forBackup); + out.endTag(null, TAG_NOTIFICATION_POLICY); + out.endDocument(); } /** Use this when you actually want to post a notification or toast. @@ -555,12 +517,15 @@ public class NotificationManagerService extends SystemService { @Override public void onNotificationClick(int callingUid, int callingPid, String key) { synchronized (mNotificationList) { - EventLogTags.writeNotificationClicked(key); NotificationRecord r = mNotificationsByKey.get(key); if (r == null) { Log.w(TAG, "No notification with key: " + key); return; } + final long now = System.currentTimeMillis(); + EventLogTags.writeNotificationClicked(key, + r.getLifespanMs(now), r.getFreshnessMs(now), r.getExposureMs(now)); + StatusBarNotification sbn = r.sbn; cancelNotification(callingUid, callingPid, sbn.getPackageName(), sbn.getTag(), sbn.getId(), Notification.FLAG_AUTO_CANCEL, @@ -573,12 +538,14 @@ public class NotificationManagerService extends SystemService { public void onNotificationActionClick(int callingUid, int callingPid, String key, int actionIndex) { synchronized (mNotificationList) { - EventLogTags.writeNotificationActionClicked(key, actionIndex); NotificationRecord r = mNotificationsByKey.get(key); if (r == null) { Log.w(TAG, "No notification with key: " + key); return; } + final long now = System.currentTimeMillis(); + EventLogTags.writeNotificationActionClicked(key, actionIndex, + r.getLifespanMs(now), r.getFreshnessMs(now), r.getExposureMs(now)); // TODO: Log action click via UsageStats. } } @@ -685,11 +652,14 @@ public class NotificationManagerService extends SystemService { @Override public void onNotificationExpansionChanged(String key, boolean userAction, boolean expanded) { - EventLogTags.writeNotificationExpansion(key, userAction ? 1 : 0, expanded ? 1 : 0); synchronized (mNotificationList) { NotificationRecord r = mNotificationsByKey.get(key); if (r != null) { r.stats.onExpansionChanged(userAction, expanded); + final long now = System.currentTimeMillis(); + EventLogTags.writeNotificationExpansion(key, + userAction ? 1 : 0, expanded ? 1 : 0, + r.getLifespanMs(now), r.getFreshnessMs(now), r.getExposureMs(now)); } } } @@ -767,6 +737,7 @@ public class NotificationManagerService extends SystemService { } mListeners.onPackagesChanged(queryReplace, pkgList); mConditionProviders.onPackagesChanged(queryReplace, pkgList); + mRankingHelper.onPackagesChanged(queryReplace, pkgList); } } }; @@ -806,8 +777,12 @@ public class NotificationManagerService extends SystemService { // Refresh managed services mConditionProviders.onUserSwitched(user); mListeners.onUserSwitched(user); + mZenModeHelper.onUserSwitched(user); } else if (action.equals(Intent.ACTION_USER_ADDED)) { mUserProfiles.updateCache(context); + } else if (action.equals(Intent.ACTION_USER_REMOVED)) { + final int user = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL); + mZenModeHelper.onUserRemoved(user); } } }; @@ -968,6 +943,7 @@ public class NotificationManagerService extends SystemService { filter.addAction(Intent.ACTION_USER_STOPPED); filter.addAction(Intent.ACTION_USER_SWITCHED); filter.addAction(Intent.ACTION_USER_ADDED); + filter.addAction(Intent.ACTION_USER_REMOVED); getContext().registerReceiver(mIntentReceiver, filter); IntentFilter pkgFilter = new IntentFilter(); @@ -1418,8 +1394,6 @@ public class NotificationManagerService extends SystemService { @Override public void setNotificationsShownFromListener(INotificationListener token, String[] keys) { - final int callingUid = Binder.getCallingUid(); - final int callingPid = Binder.getCallingPid(); long identity = Binder.clearCallingIdentity(); try { synchronized (mNotificationList) { @@ -1713,13 +1687,40 @@ public class NotificationManagerService extends SystemService { // Backup/restore interface @Override public byte[] getBackupPayload(int user) { - // TODO: build a payload of whatever is appropriate + if (DBG) Slog.d(TAG, "getBackupPayload u=" + user); + if (user != UserHandle.USER_OWNER) { + Slog.w(TAG, "getBackupPayload: cannot backup policy for user " + user); + return null; + } + final ByteArrayOutputStream baos = new ByteArrayOutputStream(); + try { + writePolicyXml(baos, true /*forBackup*/); + return baos.toByteArray(); + } catch (IOException e) { + Slog.w(TAG, "getBackupPayload: error writing payload for user " + user, e); + } return null; } @Override public void applyRestore(byte[] payload, int user) { - // TODO: apply the restored payload as new current state + if (DBG) Slog.d(TAG, "applyRestore u=" + user + " payload=" + + (payload != null ? new String(payload, StandardCharsets.UTF_8) : null)); + if (payload == null) { + Slog.w(TAG, "applyRestore: no payload to restore for user " + user); + return; + } + if (user != UserHandle.USER_OWNER) { + Slog.w(TAG, "applyRestore: cannot restore policy for user " + user); + return; + } + final ByteArrayInputStream bais = new ByteArrayInputStream(payload); + try { + readPolicyXml(bais, true /*forRestore*/); + savePolicyFile(); + } catch (NumberFormatException | XmlPullParserException | IOException e) { + Slog.w(TAG, "applyRestore: error reading payload", e); + } } @Override @@ -2787,10 +2788,8 @@ public class NotificationManagerService extends SystemService { mArchive.record(r.sbn); final long now = System.currentTimeMillis(); - final int lifespan = (int) (now - r.getCreationTimeMs()); - final long visibleSinceMs = r.getVisibleSinceMs(); - final int exposure = visibleSinceMs == 0L ? 0 : (int) (now - visibleSinceMs); - EventLogTags.writeNotificationCanceled(canceledKey, reason, lifespan, exposure); + EventLogTags.writeNotificationCanceled(canceledKey, reason, + r.getLifespanMs(now), r.getFreshnessMs(now), r.getExposureMs(now)); } /** diff --git a/services/core/java/com/android/server/notification/NotificationRecord.java b/services/core/java/com/android/server/notification/NotificationRecord.java index b8478c1..c4773ca 100644 --- a/services/core/java/com/android/server/notification/NotificationRecord.java +++ b/services/core/java/com/android/server/notification/NotificationRecord.java @@ -288,24 +288,27 @@ public final class NotificationRecord { } /** - * Returns the timestamp of the most recent updates, or the post time if none. + * @param now this current time in milliseconds. + * @returns the number of milliseconds since the most recent update, or the post time if none. */ - public long getUpdateTimeMs() { - return mUpdateTimeMs; + public int getFreshnessMs(long now) { + return (int) (now - mUpdateTimeMs); } /** - * Returns the timestamp of the first post, ignoring updates. + * @param now this current time in milliseconds. + * @returns the number of milliseconds since the the first post, ignoring updates. */ - public long getCreationTimeMs() { - return mCreationTimeMs; + public int getLifespanMs(long now) { + return (int) (now - mCreationTimeMs); } /** - * Returns the timestamp of the most recent visibility event, or 0L if hidden. + * @param now this current time in milliseconds. + * @returns the number of milliseconds since the most recent visibility event, or 0 if never. */ - public long getVisibleSinceMs() { - return mVisibleSinceMs; + public int getExposureMs(long now) { + return mVisibleSinceMs == 0 ? 0 : (int) (now - mVisibleSinceMs); } /** @@ -313,7 +316,7 @@ public final class NotificationRecord { */ public void setVisibility(boolean visible) { final long now = System.currentTimeMillis(); - mVisibleSinceMs = visible ? now : 0L; + mVisibleSinceMs = visible ? now : mVisibleSinceMs; stats.onVisibilityChanged(visible); EventLogTags.writeNotificationVisibility(getKey(), visible ? 1 : 0, (int) (now - mCreationTimeMs), diff --git a/services/core/java/com/android/server/notification/RankingHelper.java b/services/core/java/com/android/server/notification/RankingHelper.java index 88055ba..e503ac8 100644 --- a/services/core/java/com/android/server/notification/RankingHelper.java +++ b/services/core/java/com/android/server/notification/RankingHelper.java @@ -17,6 +17,8 @@ package com.android.server.notification; import android.app.Notification; import android.content.Context; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; import android.os.Handler; import android.os.Message; import android.os.UserHandle; @@ -61,6 +63,7 @@ public class RankingHelper implements RankingConfig { private final ArrayMap<String, Record> mRecords = new ArrayMap<>(); // pkg|uid => Record private final ArrayMap<String, NotificationRecord> mProxyByGroupTmp = new ArrayMap<>(); + private final ArrayMap<String, Record> mRestoredWithoutUids = new ArrayMap<>(); // pkg => Record private final Context mContext; private final Handler mRankingHandler; @@ -119,12 +122,15 @@ public class RankingHelper implements RankingConfig { } } - public void readXml(XmlPullParser parser) throws XmlPullParserException, IOException { + public void readXml(XmlPullParser parser, boolean forRestore) + throws XmlPullParserException, IOException { + final PackageManager pm = mContext.getPackageManager(); int type = parser.getEventType(); if (type != XmlPullParser.START_TAG) return; String tag = parser.getName(); if (!TAG_RANKING.equals(tag)) return; mRecords.clear(); + mRestoredWithoutUids.clear(); while ((type = parser.next()) != XmlPullParser.END_DOCUMENT) { tag = parser.getName(); if (type == XmlPullParser.END_TAG && TAG_RANKING.equals(tag)) { @@ -132,21 +138,38 @@ public class RankingHelper implements RankingConfig { } if (type == XmlPullParser.START_TAG) { if (TAG_PACKAGE.equals(tag)) { - int uid = safeInt(parser, ATT_UID, UserHandle.USER_ALL); + int uid = safeInt(parser, ATT_UID, Record.UNKNOWN_UID); int priority = safeInt(parser, ATT_PRIORITY, DEFAULT_PRIORITY); boolean peekable = safeBool(parser, ATT_PEEKABLE, DEFAULT_PEEKABLE); int vis = safeInt(parser, ATT_VISIBILITY, DEFAULT_VISIBILITY); String name = parser.getAttributeValue(null, ATT_NAME); if (!TextUtils.isEmpty(name)) { + if (forRestore) { + try { + uid = pm.getPackageUid(name, UserHandle.USER_OWNER); + } catch (NameNotFoundException e) { + // noop + } + } + Record r = null; + if (uid == Record.UNKNOWN_UID) { + r = mRestoredWithoutUids.get(name); + if (r == null) { + r = new Record(); + mRestoredWithoutUids.put(name, r); + } + } else { + r = getOrCreateRecord(name, uid); + } if (priority != DEFAULT_PRIORITY) { - getOrCreateRecord(name, uid).priority = priority; + r.priority = priority; } if (peekable != DEFAULT_PEEKABLE) { - getOrCreateRecord(name, uid).peekable = peekable; + r.peekable = peekable; } if (vis != DEFAULT_VISIBILITY) { - getOrCreateRecord(name, uid).visibility = vis; + r.visibility = vis; } } } @@ -182,13 +205,16 @@ public class RankingHelper implements RankingConfig { } } - public void writeXml(XmlSerializer out) throws IOException { + public void writeXml(XmlSerializer out, boolean forBackup) throws IOException { out.startTag(null, TAG_RANKING); out.attribute(null, ATT_VERSION, Integer.toString(XML_VERSION)); final int N = mRecords.size(); for (int i = 0; i < N; i++) { final Record r = mRecords.valueAt(i); + if (forBackup && UserHandle.getUserId(r.uid) != UserHandle.USER_OWNER) { + continue; + } out.startTag(null, TAG_PACKAGE); out.attribute(null, ATT_NAME, r.pkg); if (r.priority != DEFAULT_PRIORITY) { @@ -200,7 +226,9 @@ public class RankingHelper implements RankingConfig { if (r.visibility != DEFAULT_VISIBILITY) { out.attribute(null, ATT_VISIBILITY, Integer.toString(r.visibility)); } - out.attribute(null, ATT_UID, Integer.toString(r.uid)); + if (!forBackup) { + out.attribute(null, ATT_UID, Integer.toString(r.uid)); + } out.endTag(null, TAG_PACKAGE); } out.endTag(null, TAG_RANKING); @@ -364,15 +392,21 @@ public class RankingHelper implements RankingConfig { pw.print(prefix); pw.println("per-package config:"); } - final int N = mRecords.size(); + dumpRecords(pw, prefix, filter, mRecords); + dumpRecords(pw, prefix, filter, mRestoredWithoutUids); + } + + private static void dumpRecords(PrintWriter pw, String prefix, + NotificationManagerService.DumpFilter filter, ArrayMap<String, Record> records) { + final int N = records.size(); for (int i = 0; i < N; i++) { - final Record r = mRecords.valueAt(i); + final Record r = records.valueAt(i); if (filter == null || filter.matches(r.pkg)) { pw.print(prefix); pw.print(" "); pw.print(r.pkg); pw.print(" ("); - pw.print(r.uid); + pw.print(r.uid == Record.UNKNOWN_UID ? "UNKNOWN_UID" : Integer.toString(r.uid)); pw.print(')'); if (r.priority != DEFAULT_PRIORITY) { pw.print(" priority="); @@ -391,11 +425,39 @@ public class RankingHelper implements RankingConfig { } } + public void onPackagesChanged(boolean queryReplace, String[] pkgList) { + if (queryReplace || pkgList == null || pkgList.length == 0 + || mRestoredWithoutUids.isEmpty()) { + return; // nothing to do + } + final PackageManager pm = mContext.getPackageManager(); + boolean updated = false; + for (String pkg : pkgList) { + final Record r = mRestoredWithoutUids.get(pkg); + if (r != null) { + try { + r.uid = pm.getPackageUid(r.pkg, UserHandle.USER_OWNER); + mRestoredWithoutUids.remove(pkg); + mRecords.put(recordKey(r.pkg, r.uid), r); + updated = true; + } catch (NameNotFoundException e) { + // noop + } + } + } + if (updated) { + updateConfig(); + } + } + private static class Record { + static int UNKNOWN_UID = UserHandle.USER_NULL; + String pkg; - int uid; + int uid = UNKNOWN_UID; int priority = DEFAULT_PRIORITY; boolean peekable = DEFAULT_PEEKABLE; int visibility = DEFAULT_VISIBILITY; } + } diff --git a/services/core/java/com/android/server/notification/ZenLog.java b/services/core/java/com/android/server/notification/ZenLog.java index 44fbd2d..c45071b 100644 --- a/services/core/java/com/android/server/notification/ZenLog.java +++ b/services/core/java/com/android/server/notification/ZenLog.java @@ -115,8 +115,11 @@ public class ZenLog { append(TYPE_UNSUBSCRIBE, uri + "," + subscribeResult(provider, e)); } - public static void traceConfig(String reason, ZenModeConfig newConfig) { - append(TYPE_CONFIG, reason + "," + (newConfig != null ? newConfig.toString() : null)); + public static void traceConfig(String reason, ZenModeConfig oldConfig, + ZenModeConfig newConfig) { + append(TYPE_CONFIG, reason + + "," + (newConfig != null ? newConfig.toString() : null) + + "," + ZenModeConfig.diff(oldConfig, newConfig)); } public static void traceDisableEffects(NotificationRecord record, String reason) { diff --git a/services/core/java/com/android/server/notification/ZenModeConditions.java b/services/core/java/com/android/server/notification/ZenModeConditions.java index d6b7f2f..b89a654 100644 --- a/services/core/java/com/android/server/notification/ZenModeConditions.java +++ b/services/core/java/com/android/server/notification/ZenModeConditions.java @@ -63,7 +63,7 @@ public class ZenModeConditions implements ConditionProviders.Callback { mConditionProviders.requestConditions(callback, relevance); } - public void evaluateConfig(ZenModeConfig config, boolean processSubscriptione) { + public void evaluateConfig(ZenModeConfig config, boolean processSubscriptions) { if (config == null) return; if (config.manualRule != null && config.manualRule.condition != null && !config.manualRule.isTrueOrUnknown()) { @@ -71,16 +71,16 @@ public class ZenModeConditions implements ConditionProviders.Callback { config.manualRule = null; } final ArraySet<Uri> current = new ArraySet<>(); - evaluateRule(config.manualRule, current, processSubscriptione); + evaluateRule(config.manualRule, current, processSubscriptions); for (ZenRule automaticRule : config.automaticRules.values()) { - evaluateRule(automaticRule, current, processSubscriptione); + evaluateRule(automaticRule, current, processSubscriptions); updateSnoozing(automaticRule); } final int N = mSubscriptions.size(); for (int i = N - 1; i >= 0; i--) { final Uri id = mSubscriptions.keyAt(i); final ComponentName component = mSubscriptions.valueAt(i); - if (processSubscriptione) { + if (processSubscriptions) { if (!current.contains(id)) { mConditionProviders.unsubscribeIfNecessary(component, id); mSubscriptions.removeAt(i); @@ -157,6 +157,11 @@ public class ZenModeConditions implements ConditionProviders.Callback { if (DEBUG) Log.d(TAG, "zmc failed to subscribe"); } } + if (rule.condition == null) { + rule.condition = mConditionProviders.findCondition(rule.component, rule.conditionId); + if (rule.condition != null && DEBUG) Log.d(TAG, "Found existing condition for: " + + rule.conditionId); + } } private boolean isAutomaticActive(ComponentName component) { diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java index 1860673..755b2ea 100644 --- a/services/core/java/com/android/server/notification/ZenModeHelper.java +++ b/services/core/java/com/android/server/notification/ZenModeHelper.java @@ -46,6 +46,7 @@ import android.service.notification.ZenModeConfig.ScheduleInfo; import android.service.notification.ZenModeConfig.ZenRule; import android.util.ArraySet; import android.util.Log; +import android.util.SparseArray; import com.android.internal.R; import com.android.server.LocalServices; @@ -77,8 +78,10 @@ public class ZenModeHelper { private final ZenModeFiltering mFiltering; private final RingerModeDelegate mRingerModeDelegate = new RingerModeDelegate(); private final ZenModeConditions mConditions; + private final SparseArray<ZenModeConfig> mConfigs = new SparseArray<>(); private int mZenMode; + private int mUser = UserHandle.USER_OWNER; private ZenModeConfig mConfig; private AudioManagerInternal mAudioManager; private int mPreviousRingerMode = -1; @@ -92,6 +95,7 @@ public class ZenModeHelper { appendDefaultScheduleRules(mDefaultConfig); appendDefaultEventRules(mDefaultConfig); mConfig = mDefaultConfig; + mConfigs.put(UserHandle.USER_OWNER, mConfig); mSettingsObserver = new SettingsObserver(mHandler); mSettingsObserver.observe(); mFiltering = new ZenModeFiltering(mContext); @@ -142,6 +146,25 @@ public class ZenModeHelper { } } + public void onUserSwitched(int user) { + if (mUser == user || user < UserHandle.USER_OWNER) return; + mUser = user; + if (DEBUG) Log.d(TAG, "onUserSwitched u=" + user); + ZenModeConfig config = mConfigs.get(user); + if (config == null) { + if (DEBUG) Log.d(TAG, "onUserSwitched: generating default config for user " + user); + config = mDefaultConfig.copy(); + config.user = user; + } + setConfig(config, "onUserSwitched"); + } + + public void onUserRemoved(int user) { + if (user < UserHandle.USER_OWNER) return; + if (DEBUG) Log.d(TAG, "onUserRemoved u=" + user); + mConfigs.remove(user); + } + public void requestZenModeConditions(IConditionListener callback, int relevance) { mConditions.requestConditions(callback, relevance); } @@ -200,8 +223,13 @@ public class ZenModeHelper { public void dump(PrintWriter pw, String prefix) { pw.print(prefix); pw.print("mZenMode="); pw.println(Global.zenModeToString(mZenMode)); - dump(pw, prefix, "mConfig", mConfig); dump(pw, prefix, "mDefaultConfig", mDefaultConfig); + final int N = mConfigs.size(); + for (int i = 0; i < N; i++) { + dump(pw, prefix, "mConfigs[u=" + mConfigs.keyAt(i) + "]", mConfigs.valueAt(i)); + } + pw.print(prefix); pw.print("mUser="); pw.println(mUser); + dump(pw, prefix, "mConfig", mConfig); pw.print(prefix); pw.print("mPreviousRingerMode="); pw.println(mPreviousRingerMode); pw.print(prefix); pw.print("mEffectsSuppressed="); pw.println(mEffectsSuppressed); mFiltering.dump(pw, prefix); @@ -228,16 +256,29 @@ public class ZenModeHelper { } } - public void readXml(XmlPullParser parser) throws XmlPullParserException, IOException { + public void readXml(XmlPullParser parser, boolean forRestore) + throws XmlPullParserException, IOException { final ZenModeConfig config = ZenModeConfig.readXml(parser, mConfigMigration); if (config != null) { + if (forRestore) { + if (config.user != UserHandle.USER_OWNER) { + return; + } + config.manualRule = null; // don't restore the manual rule + } if (DEBUG) Log.d(TAG, "readXml"); setConfig(config, "readXml"); } } - public void writeXml(XmlSerializer out) throws IOException { - mConfig.writeXml(out); + public void writeXml(XmlSerializer out, boolean forBackup) throws IOException { + final int N = mConfigs.size(); + for (int i = 0; i < N; i++) { + if (forBackup && mConfigs.keyAt(i) != UserHandle.USER_OWNER) { + continue; + } + mConfigs.valueAt(i).writeXml(out); + } } public Policy getNotificationPolicy() { @@ -268,10 +309,17 @@ public class ZenModeHelper { Log.w(TAG, "Invalid config in setConfig; " + config); return false; } + if (config.user != mUser) { + // simply store away for background users + mConfigs.put(config.user, config); + if (DEBUG) Log.d(TAG, "setConfig: store config for user " + config.user); + return true; + } mConditions.evaluateConfig(config, false /*processSubscriptions*/); // may modify config + mConfigs.put(config.user, config); if (config.equals(mConfig)) return true; if (DEBUG) Log.d(TAG, "setConfig reason=" + reason, new Throwable()); - ZenLog.traceConfig(reason, config); + ZenLog.traceConfig(reason, mConfig, config); final boolean policyChanged = !Objects.equals(getNotificationPolicy(mConfig), getNotificationPolicy(config)); mConfig = config; diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index f94c77b..671c44e 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -3642,15 +3642,24 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } + private boolean canReceiveInput(WindowState win) { + boolean notFocusable = + (win.getAttrs().flags & WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) != 0; + boolean altFocusableIm = + (win.getAttrs().flags & WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM) != 0; + boolean notFocusableForIm = notFocusable ^ altFocusableIm; + return !notFocusableForIm; + } + /** {@inheritDoc} */ @Override public void layoutWindowLw(WindowState win, WindowState attached) { - // we've already done the status bar - final WindowManager.LayoutParams attrs = win.getAttrs(); - if ((win == mStatusBar && (attrs.privateFlags & PRIVATE_FLAG_KEYGUARD) == 0) || - win == mNavigationBar) { + // We've already done the navigation bar and status bar. If the status bar can receive + // input, we need to layout it again to accomodate for the IME window. + if ((win == mStatusBar && !canReceiveInput(win)) || win == mNavigationBar) { return; } + final WindowManager.LayoutParams attrs = win.getAttrs(); final boolean isDefaultDisplay = win.isDefaultDisplay(); final boolean needsToOffsetInputMethodTarget = isDefaultDisplay && (win == mLastInputMethodTargetWindow && mLastInputMethodWindow != null); @@ -3717,7 +3726,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { + mUnrestrictedScreenHeight; cf.bottom = vf.bottom = mStableBottom; cf.top = vf.top = mStableTop; - } else if (win == mStatusBar && (attrs.privateFlags & PRIVATE_FLAG_KEYGUARD) != 0) { + } else if (win == mStatusBar) { pf.left = df.left = of.left = mUnrestrictedScreenLeft; pf.top = df.top = of.top = mUnrestrictedScreenTop; pf.right = df.right = of.right = mUnrestrictedScreenWidth + mUnrestrictedScreenLeft; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 7d39efc..76da13f 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -216,7 +216,8 @@ public class CarrierConfigManager { public static final String INT_VVM_PORT_NUMBER = "int_vvm_port_number"; /** - * The type of visual voicemail protocol the carrier adheres to (see below). + * The type of visual voicemail protocol the carrier adheres to. See {@link TelephonyManager} + * for possible values. For example {@link TelephonyManager#VVM_TYPE_OMTP}. * * @hide */ @@ -304,7 +305,7 @@ public class CarrierConfigManager { * </p> * <p> * This method returns before the reload has completed, and - * {@link android.service.carrier.CarrierConfigService#onLoadConfig} will be called from an + * {@link android.service.carrier.CarrierService#onLoadConfig} will be called from an * arbitrary thread. * </p> */ diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index fbc70de..a47f5e9 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -4580,4 +4580,18 @@ public class TelephonyManager { } catch (RemoteException e) { } } + + + /** @hide */ + public String getLocaleFromDefaultSim() { + try { + final ITelephony telephony = getITelephony(); + if (telephony != null) { + return telephony.getLocaleFromDefaultSim(); + } + } catch (RemoteException ex) { + } + + return null; + } } diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 25fe97c..11d0ea6 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -945,4 +945,12 @@ interface ITelephony { int getSubIdForPhoneAccount(in PhoneAccount phoneAccount); void factoryReset(int subId); + + /** + * An estimate of the users's current locale based on the default SIM. + * + * The returned string will be a well formed BCP-47 language tag, or {@code null} + * if no locale could be derived. + */ + String getLocaleFromDefaultSim(); } diff --git a/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibility.java b/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibility.java index eaff6c7..f81b001 100644 --- a/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibility.java +++ b/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibility.java @@ -17,6 +17,7 @@ package com.android.compatibilitytest; import android.app.ActivityManager; +import android.app.UiAutomation; import android.app.UiModeManager; import android.app.ActivityManager.ProcessErrorStateInfo; import android.app.ActivityManager.RunningTaskInfo; @@ -82,10 +83,12 @@ public class AppCompatibility extends InstrumentationTestCase { if (workspaceLaunchTimeoutMsecs != null) { mWorkspaceLaunchTimeout = Integer.parseInt(workspaceLaunchTimeoutMsecs); } + getInstrumentation().getUiAutomation().setRotation(UiAutomation.ROTATION_FREEZE_0); } @Override protected void tearDown() throws Exception { + getInstrumentation().getUiAutomation().setRotation(UiAutomation.ROTATION_UNFREEZE); super.tearDown(); } diff --git a/tests/VectorDrawableTest/AndroidManifest.xml b/tests/VectorDrawableTest/AndroidManifest.xml index 991ec57..e648897 100644 --- a/tests/VectorDrawableTest/AndroidManifest.xml +++ b/tests/VectorDrawableTest/AndroidManifest.xml @@ -144,6 +144,15 @@ </intent-filter> </activity> <activity + android:name="AnimatedVectorDrawableAttr" + android:label="AnimatedVectorDrawable Attr Test" > + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + + <category android:name="com.android.test.dynamic.TEST" /> + </intent-filter> + </activity> + <activity android:name="BoundsCheckTest" android:label="SetBound check" > <intent-filter> @@ -154,4 +163,4 @@ </activity> </application> -</manifest>
\ No newline at end of file +</manifest> diff --git a/tests/VectorDrawableTest/res/anim/blink.xml b/tests/VectorDrawableTest/res/anim/blink.xml new file mode 100644 index 0000000..2af0b48 --- /dev/null +++ b/tests/VectorDrawableTest/res/anim/blink.xml @@ -0,0 +1,28 @@ +<!-- + Copyright (C) 2015 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. +--> +<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" + android:interpolator="@android:anim/linear_interpolator" + android:duration="@android:integer/config_longAnimTime" + android:repeatCount="-1" + android:repeatMode="reverse" > + + <propertyValuesHolder + android:propertyName="fillColor" + android:valueType="colorType" + android:valueFrom="#ff3838" + android:valueTo="?attr/color1" /> + +</objectAnimator> diff --git a/tests/VectorDrawableTest/res/drawable/animated_vector_drawable_attr_icon.xml b/tests/VectorDrawableTest/res/drawable/animated_vector_drawable_attr_icon.xml new file mode 100644 index 0000000..10a0970 --- /dev/null +++ b/tests/VectorDrawableTest/res/drawable/animated_vector_drawable_attr_icon.xml @@ -0,0 +1,93 @@ +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="250dp" + android:height="250dp" + android:viewportWidth="200" + android:viewportHeight="200"> + + <path + android:pathData="M-3.476563,-21.275826l34.441406,18.748753 0.000000,37.497501 -34.441406,18.748756 -34.441406,-18.718758 0.000000,-37.527500z" + android:strokeWidth="2.5" + android:fillColor="@color/color0" + android:strokeColor="@android:color/white"/> + <path + android:pathData="M65.5,-21.497507l34.441406,18.748756 0.000000,37.497498 -34.441406,18.748756 -34.441406,-18.718754 0.000000,-37.527496z" + android:strokeWidth="2.5" + android:fillColor="@color/color0" + android:strokeColor="@android:color/white"/> + <path + android:pathData="M202.75,-21.497507l34.441406,18.748756 0.000000,37.497498 -34.441406,18.748760 -34.441406,-18.718758 0.000000,-37.527496z" + android:strokeWidth="2.5" + android:fillColor="@color/color0" + android:strokeColor="@android:color/white"/> + <path + android:pathData="M134.125,-21.497505l34.441406,18.748756 0.000000,37.497498 -34.441406,18.748756 -34.441406,-18.718758 0.000000,-37.527496z" + android:strokeWidth="2.5" + android:fillColor="@color/color0" + android:strokeColor="@android:color/white"/> + <path + android:name="hex" + android:pathData="M99.8125,34.752495l34.441406,18.748753 0.000000,37.497501 -34.441406,18.748749 -34.441406,-18.718750 0.000000,-37.527500z" + android:strokeWidth="2.5" + android:fillColor="?attr/color1" + android:strokeColor="@android:color/white"/> + <path + android:pathData="M30.6875,34.689995l34.441406,18.748756 0.000000,37.497498 -34.441406,18.748749 -34.441406,-18.718750 0.000000,-37.527496z" + android:strokeWidth="2.5" + android:fillColor="@color/color0" + android:strokeColor="@android:color/white"/> + <path + android:pathData="M168.3125,35.002495l34.441406,18.748756 0.000000,37.497498 -34.441406,18.748749 -34.441406,-18.718750 0.000000,-37.527496z" + android:strokeWidth="2.5" + android:fillColor="@color/color0" + android:strokeColor="@android:color/white"/> + <path + android:pathData="M203.0,91.002495l34.441406,18.748756 0.000000,37.497498 -34.441406,18.748749 -34.441406,-18.718750 0.000000,-37.527496z" + android:strokeWidth="2.5" + android:fillColor="@color/color0" + android:strokeColor="@android:color/white"/> + <path + android:pathData="M133.8125,91.314995l34.441406,18.748756 0.000000,37.497498 -34.441406,18.748749 -34.441406,-18.718750 0.000000,-37.527496z" + android:strokeWidth="2.5" + android:fillColor="@color/color3" + android:strokeColor="@android:color/white"/> + <path + android:pathData="M65.0625,91.127495l34.441406,18.748756 0.000000,37.497498 -34.441406,18.748749 -34.441406,-18.718750 0.000000,-37.527496z" + android:strokeWidth="2.5" + android:fillColor="@color/color2" + android:strokeColor="@android:color/white"/> + <path + android:pathData="M-3.25,91.189995l34.441406,18.748756 0.000000,37.497498 -34.441406,18.748749 -34.441406,-18.718750 0.000000,-37.527496z" + android:strokeWidth="2.5" + android:fillColor="@color/color0" + android:strokeColor="@android:color/white"/> + <path + android:pathData="M31.0625,147.81499l34.441406,18.748764 0.000000,37.497498 -34.441406,18.748749 -34.441406,-18.718750 0.000000,-37.527496z" + android:strokeWidth="2.5" + android:fillColor="@color/color0" + android:strokeColor="@android:color/white"/> + <path + android:pathData="M99.625,147.37749l34.441406,18.748764 0.000000,37.497498 -34.441406,18.748749 -34.441406,-18.718750 0.000000,-37.527496z" + android:strokeWidth="2.5" + android:fillColor="@color/color0" + android:strokeColor="@android:color/white"/> + <path + android:pathData="M168.8125,147.50249l34.441406,18.748764 0.000000,37.497498 -34.441406,18.748749 -34.441406,-18.718750 0.000000,-37.527496z" + android:strokeWidth="2.5" + android:fillColor="@color/color0" + android:strokeColor="@android:color/white"/> +</vector> diff --git a/tests/VectorDrawableTest/res/drawable/animated_vector_drawable_attr_icon_animated.xml b/tests/VectorDrawableTest/res/drawable/animated_vector_drawable_attr_icon_animated.xml new file mode 100644 index 0000000..7e65229 --- /dev/null +++ b/tests/VectorDrawableTest/res/drawable/animated_vector_drawable_attr_icon_animated.xml @@ -0,0 +1,21 @@ +<!-- +Copyright (C) 2015 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. +--> +<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" + android:drawable="@drawable/animated_vector_drawable_attr_icon" > + <target + android:name="hex" + android:animation="@anim/blink" /> +</animated-vector> diff --git a/tests/VectorDrawableTest/res/layout/activity_animated_vector_drawable_attr.xml b/tests/VectorDrawableTest/res/layout/activity_animated_vector_drawable_attr.xml new file mode 100644 index 0000000..92680d5 --- /dev/null +++ b/tests/VectorDrawableTest/res/layout/activity_animated_vector_drawable_attr.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 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. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" > + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="50dp" + android:src="@drawable/animated_vector_drawable_attr_icon" + android:theme="@style/ColorTheme" /> + + <ImageView + android:id="@+id/avd" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/animated_vector_drawable_attr_icon_animated" + android:theme="@style/ColorTheme" /> + +</LinearLayout> + diff --git a/core/res/res/drawable/dialog_background_shadow_material.xml b/tests/VectorDrawableTest/res/values/attrs.xml index 0554920..98bf992 100644 --- a/core/res/res/drawable/dialog_background_shadow_material.xml +++ b/tests/VectorDrawableTest/res/values/attrs.xml @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 The Android Open Source Project +<!-- Copyright (C) 2015 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. @@ -13,8 +12,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - -<nine-patch xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/dialog_background_mtrl_mult" - android:tint="?attr/colorBackground" - android:tintMode="multiply" /> +<resources> + <attr name="color1" format="color" /> +</resources> diff --git a/tests/VectorDrawableTest/res/values/colors.xml b/tests/VectorDrawableTest/res/values/colors.xml new file mode 100644 index 0000000..6eb3036 --- /dev/null +++ b/tests/VectorDrawableTest/res/values/colors.xml @@ -0,0 +1,20 @@ +<!-- Copyright (C) 2015 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. +--> +<resources> + <color name="color0">#a6e4ea</color> + <color name="color1">#ff3838</color> + <color name="color2">#ffff51</color> + <color name="color3">#0ed300</color> +</resources> diff --git a/tests/VectorDrawableTest/res/values/styles.xml b/tests/VectorDrawableTest/res/values/styles.xml index 460c0db..8adc034 100644 --- a/tests/VectorDrawableTest/res/values/styles.xml +++ b/tests/VectorDrawableTest/res/values/styles.xml @@ -13,4 +13,7 @@ limitations under the License. --> <resources> + <style name="ColorTheme"> + <item name="color1">@color/color1</item> + </style> </resources> diff --git a/tests/VectorDrawableTest/src/com/android/test/dynamic/AnimatedVectorDrawableAttr.java b/tests/VectorDrawableTest/src/com/android/test/dynamic/AnimatedVectorDrawableAttr.java new file mode 100644 index 0000000..8de2f6b --- /dev/null +++ b/tests/VectorDrawableTest/src/com/android/test/dynamic/AnimatedVectorDrawableAttr.java @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2015 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.test.dynamic; + +import android.app.Activity; +import android.graphics.drawable.AnimatedVectorDrawable; +import android.os.Bundle; +import android.widget.ImageView; + +public class AnimatedVectorDrawableAttr extends Activity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_animated_vector_drawable_attr); + + ImageView avdIv = (ImageView) findViewById(R.id.avd); + AnimatedVectorDrawable avd = (AnimatedVectorDrawable) avdIv.getDrawable(); + avd.start(); + } +} |
