51634 Commits

Author SHA1 Message Date
Glenn Kasten
260c77a4f7 Use android.os.Process.THREAD_PRIORITY_* symbols
As part of latency project, searching for and replacing
hard-coded thread priorities by symbols.

Change-Id: I113c07af95f8808b889b665e884b6b41d3440f8d
2011-06-01 18:03:21 -07:00
Brett Chabot
50e51b81b1 Merge "Move bluetooth tests to their own package." 2011-06-01 16:08:20 -07:00
Brett Chabot
b525f089cf Move bluetooth tests to their own package.
Bug 4501764

Change-Id: Id65de5d96516720e75dfbb5d522f465187e73913
2011-06-01 16:04:30 -07:00
Andy Stadler
ca680af21b Merge "Use unchecked admin lookup for getStorageEncryption()" 2011-06-01 15:59:58 -07:00
Teng-Hui Zhu
b145112eff Merge "Correctly detect when switching back from full screen" 2011-06-01 15:53:18 -07:00
Brian Carlstrom
aef1987f4e Merge "Restore ResponseCodes for use with getLastError" 2011-06-01 15:31:46 -07:00
Andy Stadler
c994d693b6 Use unchecked admin lookup for getStorageEncryption()
Due to a copy/paste typo, getStorageEncryption() was protected by
getActiveAdminForCallerLocked(), which made the API unreadable if the
caller is not an admin.  This doesn't match the rest of the DPM API which
allows the "get" calls to be made anonymously.

This fix supercedes the proposed workaround CL in the DPM ApiDemo sample.

Change-Id: If1a6237634e97ced09a7c6a8876bb6b0f60c9be9
2011-06-01 15:30:54 -07:00
Brian Carlstrom
7e4b1a488d Restore ResponseCodes for use with getLastError
Change-Id: I41b5bc9cbb6c05672c92d5864e889fd2b0186141
2011-06-01 15:29:29 -07:00
Glenn Kasten
54f40eb222 Merge "Revert "Use AudioTrack::event_type not int in callback"" 2011-06-01 15:22:49 -07:00
Glenn Kasten
e46a86fcb6 Revert "Use AudioTrack::event_type not int in callback"
This reverts commit 2225e4b7049fa3fb9d39a068b8268b63c952d7c1
2011-06-01 15:20:35 -07:00
Fabrice Di Meglio
c78416fdce Merge "Fix View default horizontal direction" 2011-06-01 15:16:41 -07:00
Christopher Tate
1a536e642f Merge "Restore from a previous full backup's tarfile" 2011-06-01 15:14:36 -07:00
Christopher Tate
75a99709ac Restore from a previous full backup's tarfile
Usage:  adb restore [tarfilename]

Restores app data [and installs the apps if necessary from the backup
file] captured in a previous invocation of 'adb backup'.  The user
must explicitly acknowledge the action on-device before it is allowed
to proceed; this prevents any "invisible" pushes of content from the
host to the device.

Known issues:

* The settings databases and wallpaper are saved/restored, but lots
  of other system state is not yet captured in the full backup.  This
  means that for practical purposes this is usable for 3rd party
  apps at present but not for full-system cloning/imaging.

Change-Id: I0c748b645845e7c9178e30bf142857861a64efd3
2011-06-01 15:09:55 -07:00
Romain Guy
cb0975b3c1 Merge "Add support to OpenGLRendere to draw BiDi text. Bug #4350336" 2011-06-01 14:56:19 -07:00
Romain Guy
726aeba80f Add support to OpenGLRendere to draw BiDi text.
Bug #4350336

Change-Id: I1cf31693f7ca9653fa3a41b5b91c27ef288d680f
2011-06-01 14:55:42 -07:00
Glenn Kasten
0523c55e5f Merge "Use AudioTrack::event_type not int in callback" 2011-06-01 14:40:45 -07:00
Teng-Hui Zhu
1a88acbed9 Correctly detect when switching back from full screen
In full screen mode, the play message can be trigger, that means we can't
assume that the play message only comes from inline mode.

bug:4498120

Change-Id: Ibf85bb74778df207a6ce786dc63b0845356a281c
2011-06-01 14:34:59 -07:00
Brian Carlstrom
7ae03cda10 Merge "Integrating keystore with keyguard (Part 1 of 4)" 2011-06-01 14:33:31 -07:00
Brian Carlstrom
5cfee3fabb Integrating keystore with keyguard (Part 1 of 4)
Summary:

frameworks/base
  keystore rewrite
  keyguard integration with keystore on keyguard entry or keyguard change
  KeyStore API simplification

packages/apps/Settings
  Removed com.android.credentials.SET_PASSWORD intent support
  Added keyguard requirement for keystore use

packages/apps/CertInstaller
  Tracking KeyStore API changes
  Fix for NPE in CertInstaller when certificate lacks basic constraints

packages/apps/KeyChain
  Tracking KeyStore API changes

Details:

frameworks/base

   Move keystore from C to C++ while rewriting password
   implementation. Removed global variables. Added many comments.

	cmds/keystore/Android.mk
	cmds/keystore/keystore.h
	cmds/keystore/keystore.c => cmds/keystore/keystore.cpp
	cmds/keystore/keystore_cli.c => cmds/keystore/keystore_cli.cpp

   Changed saveLockPattern and saveLockPassword to notify the keystore
   on changes so that the keystore master key can be reencrypted when
   the keyguard changes.

	core/java/com/android/internal/widget/LockPatternUtils.java

   Changed unlock screens to pass values for keystore unlock or initialization

	policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java
	policy/src/com/android/internal/policy/impl/PatternUnlockScreen.java

   KeyStore API changes
   - renamed test() to state(), which now return a State enum
   - made APIs with byte[] key arguments private
   - added new KeyStore.isEmpty used to determine if a keyguard is required

	keystore/java/android/security/KeyStore.java

   In addition to tracking KeyStore API changes, added new testIsEmpty
   and improved some existing tests to validate expect values.

	keystore/tests/src/android/security/KeyStoreTest.java

packages/apps/Settings

    Removing com.android.credentials.SET_PASSWORD intent with the
    removal of the ability to set an explicit keystore password now
    that the keyguard value is used. Changed to ensure keyguard is
    enabled for keystore install or unlock. Cleaned up interwoven
    dialog handing into discrete dialog helper classes.

	AndroidManifest.xml
	src/com/android/settings/CredentialStorage.java

    Remove layout for entering new password

	res/layout/credentials_dialog.xml

    Remove enable credentials checkbox

	res/xml/security_settings_misc.xml
	src/com/android/settings/SecuritySettings.java

    Added ability to specify minimum quality key to ChooseLockGeneric
    Activity. Used by CredentialStorage, but could also be used by
    CryptKeeperSettings. Changed ChooseLockGeneric to understand
    minimum quality for keystore in addition to DPM and device
    encryption.

	src/com/android/settings/ChooseLockGeneric.java

    Changed to use getActivePasswordQuality from
    getKeyguardStoredPasswordQuality based on experience in
    CredentialStorage. Removed bogus class javadoc.

	src/com/android/settings/CryptKeeperSettings.java

    Tracking KeyStore API changes

	src/com/android/settings/vpn/VpnSettings.java
	src/com/android/settings/wifi/WifiSettings.java

   Removing now unused string resources

	res/values-af/strings.xml
	res/values-am/strings.xml
	res/values-ar/strings.xml
	res/values-bg/strings.xml
	res/values-ca/strings.xml
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-en-rGB/strings.xml
	res/values-es-rUS/strings.xml
	res/values-es/strings.xml
	res/values-fa/strings.xml
	res/values-fi/strings.xml
	res/values-fr/strings.xml
	res/values-hr/strings.xml
	res/values-hu/strings.xml
	res/values-in/strings.xml
	res/values-it/strings.xml
	res/values-iw/strings.xml
	res/values-ja/strings.xml
	res/values-ko/strings.xml
	res/values-lt/strings.xml
	res/values-lv/strings.xml
	res/values-ms/strings.xml
	res/values-nb/strings.xml
	res/values-nl/strings.xml
	res/values-pl/strings.xml
	res/values-pt-rPT/strings.xml
	res/values-pt/strings.xml
	res/values-rm/strings.xml
	res/values-ro/strings.xml
	res/values-ru/strings.xml
	res/values-sk/strings.xml
	res/values-sl/strings.xml
	res/values-sr/strings.xml
	res/values-sv/strings.xml
	res/values-sw/strings.xml
	res/values-th/strings.xml
	res/values-tl/strings.xml
	res/values-tr/strings.xml
	res/values-uk/strings.xml
	res/values-vi/strings.xml
	res/values-zh-rCN/strings.xml
	res/values-zh-rTW/strings.xml
	res/values-zu/strings.xml
	res/values/strings.xml

packages/apps/CertInstaller

  Tracking KeyStore API changes
	src/com/android/certinstaller/CertInstaller.java

  Fix for NPE in CertInstaller when certificate lacks basic constraints
	src/com/android/certinstaller/CredentialHelper.java

packages/apps/KeyChain

  Tracking KeyStore API changes
	src/com/android/keychain/KeyChainActivity.java
	src/com/android/keychain/KeyChainService.java
	support/src/com/android/keychain/tests/support/IKeyChainServiceTestSupport.aidl
	support/src/com/android/keychain/tests/support/KeyChainServiceTestSupport.java
	tests/src/com/android/keychain/tests/KeyChainServiceTest.java

Change-Id: Ic141fb5d4b43d12fe62cb1e29c7cbd891b4be35d
2011-06-01 14:29:59 -07:00
Shimeng (Simon) Wang
19e6a16f68 Merge "Fix overview scale setting for mobile sites." 2011-06-01 14:28:54 -07:00
Amith Yamasani
23a5996b2b Merge "Keep track of USER_QUERY to pass to the intent." 2011-06-01 14:15:09 -07:00
Shimeng (Simon) Wang
73bb5734f0 Fix overview scale setting for mobile sites.
This fix will only set the overview scale in case the screen
is rotated from landscape to protrait, since in this case
the overview scale will be smaller and need explicit setting.
For the other way around, there's no need to set and it has wrong
effect for mobile sites.

issue: 4343683
Change-Id: I92cbf848bc2ed4184bd0c6b67992ff5cbc633c9f
2011-06-01 13:57:43 -07:00
Glenn Kasten
2225e4b704 Use AudioTrack::event_type not int in callback
Change-Id: Ifefc708d46874e04fd0d01cb6e2d43b987ee796c
2011-06-01 13:50:23 -07:00
Teng-Hui Zhu
3fafd39d07 The screen shot support for inline video on Java side
Basically, the GL texture bound with Surface Texture is not a singleton any
more. And the Surface Texture will be recreated every time a new video starts.
This can help to recycle the decoder's memory while using the GL texture to
show the screen shot.

The corresponding webkit change is: 112500

Change-Id: I3c35f6a0abc70b9039c316ca82b236c797d81c7e
2011-06-01 13:42:46 -07:00
Gilles Debunne
2978cef0a7 Fix build, ran update-api
Change-Id: I778604f332bdbee901bf8670cb9397f86e3de7a9
2011-06-01 11:50:29 -07:00
Fabrice Di Meglio
4f5aa91ba5 Fix View default horizontal direction
- set default value to View.HORIZONTAL_DIRECTION_INHERIT
- code refactoring

Change-Id: Ib5b49c8f8ebd6461992bff87603fdbb4b261218e
2011-06-01 11:32:25 -07:00
Jean-Michel Trivi
d0bbdb02b2 Merge "Use channel mask instead of channel count for track creation" 2011-06-01 11:04:15 -07:00
Jean-Michel Trivi
5439223b56 Use channel mask instead of channel count for track creation
Record and playback objects (resp AudioRecord and AudioTrack)
are created using a channel mask, but this information is lost
in the mixer because only the channel count is known to
AudioFlinger. A channel count can always be derived from a
channel mask.

The change consists in:
- disambiguiting variable names for channel masks and counts
- passing the mask information from the client to AudioFlinger
 and the mixer.
- when using the DIRECT ouput, only verifying the format of
 the track is compatible with the output's for PCM.

Change-Id: I50d87bfb7d7afcabdf5f12d4ab75ef3a54132c0e
2011-06-01 10:55:29 -07:00
Gilles Debunne
829de65b9a Merge "Select all for text shown as an icon on smaller screens" 2011-06-01 10:13:42 -07:00
Gilles Debunne
703d3279e8 Merge "ActionBar makes room for icons when no title is provided" 2011-06-01 10:12:11 -07:00
Wink Saville
d1a1c09cb0 am 7f9d3210: am f55e0346: Merge "Remove or disable some verbose debugging." into honeycomb-LTE
* commit '7f9d3210cbef5c5e797f78fd3a2f836979de32e3':
  Remove or disable some verbose debugging.
2011-05-31 23:41:32 -07:00
Dianne Hackborn
4d710ad53e Merge "resolved conflicts for merge of 590ec479 to master" 2011-05-31 23:34:46 -07:00
Dianne Hackborn
36f80f3a5a resolved conflicts for merge of 590ec479 to master
Change-Id: I30503da6a73b9cb15eee66a67c75d50ccdc4b9f0
2011-05-31 23:11:16 -07:00
Joe Onorato
0d8f66f08d Put the enum constants into the api file.
Bug: 4292741
Change-Id: Ia6d934e1202f818a967ffe469aa5e4f15f4648b5
2011-05-31 18:17:20 -07:00
Svetoslav Ganov
86d2c5fa9a Merge "Removed unused service declaration from core tests." 2011-05-31 18:13:16 -07:00
Svetoslav Ganov
9909d999b7 Removed unused service declaration from core tests.
bug:4513413

Change-Id: I722655a0840762a90e581e57b7890ccc52174a0c
2011-05-31 18:11:49 -07:00
Matthew Xie
646590ef0a Merge "Add public api BluetoothSocket.isConnected." 2011-05-31 18:04:36 -07:00
Mike Lockwood
bade424fdd Merge "UsbService: Refactor USB host and device support into two separate classes" 2011-05-31 17:54:05 -07:00
Mike Lockwood
46d0adf825 UsbService: Refactor USB host and device support into two separate classes
Host support is in UsbHostManager, device support is in UsbDeviceManager

Renamed UsbDeviceSettingsManager to UsbSettingsManager

Change-Id: Ib76e72957c233fa7f08f454d4d9a2a1da6368cc7
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-31 20:52:06 -04:00
James Dong
7c2cb0c583 Merge "Send estimated bandwidth value as informational event when cache fetcher pauses" 2011-05-31 17:25:47 -07:00
Gilles Debunne
c619e74cc6 ActionBar makes room for icons when no title is provided
Change-Id: I5bd09e00b50496032deda40ea22367d727230611
2011-05-31 17:15:09 -07:00
Gilles Debunne
5e9af2ddf0 Select all for text shown as an icon on smaller screens
Text has been removed to leave space for 4 icons, that should fit
even in portrait mode.

Note: requires a definitive selectAll icon from designers.

Change-Id: I65547527e9ca872aa8888467f31fa7de9653fa77
2011-05-31 17:05:33 -07:00
Fabrice Di Meglio
38fd7cde0b Merge "Fix TextView potential NPE in isLayoutRtl()" 2011-05-31 16:57:55 -07:00
RoboErik
85284fbca7 Merge "Work on changing syncx to cal_syncx" 2011-05-31 16:44:04 -07:00
Fabrice Di Meglio
83fa41b06e Fix TextView potential NPE in isLayoutRtl()
- test if mDrawables can be null
- see bug #4517017 (was seen with Monkeys)

Change-Id: I07f04c88a238d1cae6fe89b0ab56fc2c456b8534
2011-05-31 16:35:18 -07:00
Mike Lockwood
b0aee3ee43 Merge "Move stringToFile utility from ConnectivityService to FileUtils" 2011-05-31 16:14:08 -07:00
Jeff Brown
b530abcff5 am 3f5b95b0: am a4e74744: am fa574c0e: Merge "Touch pad UX improvements." into honeycomb-mr2
* commit '3f5b95b05efcf7ab2e8f193649b841dc1786f2ef':
  Touch pad UX improvements.
2011-05-31 16:03:07 -07:00
Jeff Brown
e129509422 am fd86ab8a: (-s ours) am 919a2efe: am 5665770b: Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2
* commit 'fd86ab8a0f15bb15a8c274b8ea61743216f39532':
  Fix deadlock in dispatcher. (DO NOT MERGE)
2011-05-31 16:02:54 -07:00
Adam Powell
60761f4fa5 am 31caa0e6: am b017632d: am 5a328f0f: Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2
* commit '31caa0e6e5c83cb03518ffe423ea5e37e452c8ae':
  Updated popup dialog 9 patches (light)
2011-05-31 16:02:41 -07:00
Joe Onorato
7052f307f4 am 7f818d0a: am 94a06bd8: am 6fb093b1: Merge "Move status bar icons to sw600." into honeycomb-mr2
* commit '7f818d0a97ecd7793811ff5549a4b67521d93f49':
  Move status bar icons to sw600.
2011-05-31 16:02:26 -07:00