diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-08-12 21:11:00 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2009-08-12 21:32:10 -0700 |
| commit | 04bfa42078020de663747c9110a14c0529481fe6 (patch) | |
| tree | 67e29869e77871dd12884ef3a0a2cfc07b377cf3 /core/java/android/os | |
| parent | add6cc9df24e3af34a425df87f13e34ecabc887e (diff) | |
| parent | 6550076f6c093f9919c9e0784558365b518b4e0d (diff) | |
| download | frameworks_base-04bfa42078020de663747c9110a14c0529481fe6.zip frameworks_base-04bfa42078020de663747c9110a14c0529481fe6.tar.gz frameworks_base-04bfa42078020de663747c9110a14c0529481fe6.tar.bz2 | |
resolved conflicts for merge of 6550076f to master
Diffstat (limited to 'core/java/android/os')
| -rw-r--r-- | core/java/android/os/Build.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 830b0bd..1775a4b 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -120,9 +120,18 @@ public class Build { * {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} permission to be * able to modify the contents of the SD card. (Apps targeting * earlier versions will always request the permission.) + * <li> They must explicitly request the + * {@link android.Manifest.permission#READ_PHONE_STATE} permission to be + * able to be able to retrieve phone state info. (Apps targeting + * earlier versions will always request the permission.) + * <li> They are assumed to support different screen densities and + * sizes. (Apps targeting earlier versions are assumed to only support + * medium density normal size screens unless otherwise indicated). + * They can still explicitly specify screen support either way with the + * supports-screens manifest tag. * </ul> */ - public static final int DONUT = CUR_DEVELOPMENT; + public static final int DONUT = 4; } /** The type of build, like "user" or "eng". */ |