65627 Commits

Author SHA1 Message Date
Joe Onorato
79824179b8 Support putting Flattenables in Lists. 2012-02-10 14:44:04 -08:00
Joe Onorato
6e0f981e86 Was generating code that uses the wrong RpcData. 2012-02-10 14:44:04 -08:00
Doug Zongker
d60ae7f668 store the hw addr in the extraInfo field of ethernet NetworkInfos 2012-02-10 14:44:03 -08:00
Amith Yamasani
f0451db422 Merge "Multi-user - wallpaper service" 2012-02-10 14:34:52 -08:00
Amith Yamasani
37ce3a8af6 Multi-user - wallpaper service
- Allow each user to have their own wallpaper (live or static).
- Migrate old wallpaper on upgrade.
- Update SystemBackupAgent to backup/restore from primary user's
  new wallpaper directory.

Reduce dependency on Binder.getOrigCallingUser() by passing the
userId for bindService.

Change-Id: I19c8c3296d3d2efa7f28f951d4b84407489e2166
2012-02-10 14:34:07 -08:00
James Dong
385f1cafa6 Merge "Move away from MediaDebug and use ADebug instead" 2012-02-10 14:17:06 -08:00
Jason Sams
cb66aec0bd Merge "Start implementing SurfaceTexture streaming into RS allocations." 2012-02-10 13:51:04 -08:00
Glenn Kasten
1137be1a68 Follow raw pointer and sp<> conventions
Unconditional delete for raw pointers.
Use "if (sp != 0)" not "if (sp.get() != 0)" or "if (sp != NULL)".
Use "if (raw != NULL)" not "if (raw)".

Change-Id: I531a8da7c37149261ed2f34b862ec4896a4b785b
2012-02-10 13:48:44 -08:00
Glenn Kasten
5dd4754f58 Merge "No newline or space at end of ALOG format string" 2012-02-10 13:36:24 -08:00
Glenn Kasten
c1513f42ee Merge "Move declaration of stream_type_t up earlier" 2012-02-10 13:33:31 -08:00
Glenn Kasten
80d0a9db55 Merge "Fix typos in ALOG for pid vs tid" 2012-02-10 13:33:02 -08:00
Glenn Kasten
9fd2d6b1a6 Merge "Rename type() to streamType()" 2012-02-10 13:30:24 -08:00
Jason Sams
532efd3ce2 Start implementing SurfaceTexture streaming into RS allocations.
Change-Id: I561fbb63c63371ea59047c07fb2d68c21d16e76b

Conflicts:

	libs/rs/rsAllocation.h
2012-02-10 13:24:18 -08:00
Eric Fischer
7aedd945ed am 5b6f9bf5: (-s ours) am 8b6d7b06: am 650462bb: Import revised translations. DO NOT MERGE
* commit '5b6f9bf51c13532acac782a23506cb0b783b8876':
2012-02-10 13:15:26 -08:00
Eric Fischer
c3b2027498 am ffb2473b: (-s ours) am a2c92418: am 650462bb: Import revised translations. DO NOT MERGE
* commit 'ffb2473b3bd8a4986e41ff0a711e708656432eaf':
  Import revised translations.  DO NOT MERGE
2012-02-10 13:15:23 -08:00
Eric Fischer
5b6f9bf51c am 8b6d7b06: am 650462bb: Import revised translations. DO NOT MERGE
* commit '8b6d7b063b5a94b59b4a1132763f4644ee1d8545':
2012-02-10 13:13:58 -08:00
Eric Fischer
ffb2473b3b am a2c92418: am 650462bb: Import revised translations. DO NOT MERGE
* commit 'a2c9241869c14a058621668d65ca29fc8a867bbf':
  Import revised translations.  DO NOT MERGE
2012-02-10 13:13:30 -08:00
Eric Fischer
a2c9241869 am 650462bb: Import revised translations. DO NOT MERGE
* commit '650462bbfd6218c918cd9507ea0a33fa9a936f26':
  Import revised translations.  DO NOT MERGE
2012-02-10 13:11:46 -08:00
Eric Fischer
8b6d7b063b am 650462bb: Import revised translations. DO NOT MERGE
* commit '650462bbfd6218c918cd9507ea0a33fa9a936f26':
  Import revised translations.  DO NOT MERGE
2012-02-10 13:11:45 -08:00
Dianne Hackborn
16e19ce919 Merge "Clean up and expose LongSparseArray." 2012-02-10 13:07:54 -08:00
Mike Lockwood
aab002bdd4 Merge changes I54a4a41a,Ic067c9c3,I491f40dd,I3a2ce935,I3df2549c,Icba928ce
* changes:
  Make ActivityManagerService just kill apps when they crash on headless devices.
  Add support for disabling wallpaper service
  Fix merge problem
  Add the ability to pass float extras to AM.
  Adding a feature to indicate specific support for Bluetooth API.
  SystemServer: Add support for disabling AudioService and MountService
2012-02-10 13:05:13 -08:00
Mike Lockwood
ab3ea05d63 Merge "BatteryService: Don't fail to register native methods if kernel power supply driver is missing" 2012-02-10 13:03:24 -08:00
Dianne Hackborn
9c1d2980f2 Clean up and expose LongSparseArray.
Change-Id: I15ba98d65e790ba45391cc7714f60b6e7de6ebfc
2012-02-10 13:02:11 -08:00
Eric Fischer
598465d374 Merge "Import translations." 2012-02-10 12:54:21 -08:00
Joe Onorato
54a4a41a60 Make ActivityManagerService just kill apps when they crash on headless devices. 2012-02-10 12:52:54 -08:00
Mike Lockwood
c067c9c373 Add support for disabling wallpaper service
Signed-off-by: Mike Lockwood <lockwood@android.com>
2012-02-10 12:52:46 -08:00
Eric Fischer
591c68b8da Import translations.
Change-Id: Ide4ef4044be2dc8116dfca089c927c3030c9bbc4
2012-02-10 12:49:09 -08:00
Eric Fischer
650462bbfd Import revised translations. DO NOT MERGE
Change-Id: Ibfc588d17f79baa0359d3a20a0a5ff7a2f3f152b
2012-02-10 12:29:26 -08:00
Mike Lockwood
491f40ddf2 Fix merge problem
Signed-off-by: Mike Lockwood <lockwood@android.com>
2012-02-10 12:09:31 -08:00
Mike J. Chen
3a2ce935b9 Add the ability to pass float extras to AM.
commit 43a2825a283e29c0f70100146394957af0598b0e
Author: John Grossman <johngro@google.com>
Date:   Wed Apr 27 09:03:53 2011 -0700

    Add the ability to pass float extras to AM.

    Change-Id: I970ad3f76a65bd781099204019095c73ed8c09db

Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>

Conflicts:

	cmds/am/src/com/android/commands/am/Am.java
2012-02-10 12:03:53 -08:00
Dan Morrill
3df2549cb7 Adding a feature to indicate specific support for Bluetooth API. 2012-02-10 12:02:28 -08:00
Mike Lockwood
cba928cef7 SystemServer: Add support for disabling AudioService and MountService
Using the same convention in system_init.cpp, you can disable these
services by setting system properties:

	system_init.startaudioservice=0
	system_init.startmountservice=0

Signed-off-by: Mike Lockwood <lockwood@android.com>
2012-02-10 12:02:04 -08:00
Mike Lockwood
a21e945502 BatteryService: Don't fail to register native methods if kernel power supply driver is missing
Signed-off-by: Mike Lockwood <lockwood@android.com>
2012-02-10 12:00:32 -08:00
Mike Lockwood
11ca31729c Merge changes Id747dc81,I3a74bd36,I2395527c,I86aeb066,Ic33d5766,I7bef7390,I4b797dd8,Id3622e9e,I28087c63,Ia1c6d909,I95a766dd,I6c0236c5,Ib71287f4,I4bcbefdc,I22a7cb8d,Ie24dbeaf,I7dbc4b45,I21d524ea,Iaa5bf14e,I7db766c3,I93fcaca2,I1eb72044,I05ffbe7c,Ifdfe2ff8,Ia8f767a2
* changes:
  Fix problems dispatching media button events on headless devices
  Add headless mode for running the framework without the surface flinger
  SettingsProvider: Allow overridding default value for Setttings.Secure.DEVICE_PROVISIONED
  Load lockscreen.disabled setting on database create as well as upgrade
  SystemUI: Log an error instead of throwing an exception if navigation bar is enabled in tablet UI
  SettingsProvider: Add support for overriding lockscreen.disabled default value
  Allow overriding default STAY_ON_WHILE_PLUGGED_IN setting value in an overlay
  Disable output processing when opening serial port.
  Update aidl for new Broker API.
  aidl: All flattenable types now must also be parcelable.
  Update aidl to new APIs.
  Suport RpcData as a parcelable type.
  Modified AIDL to support authentication
  Fix disconnect from wired ethernet issues.
  Fix PresenterClass by adding a _listener field
  add presenters to aidl.
  Add SerialPort.sendBreak()
  Generate fallthrough for unhandled actions in RPC methods.
  PhoneWindowManager: Disable boot progress dialog on headless builds
  Support custom flattenable types for RPC.
  SystemServer: Don't start A2DP service if audio is not enabled
  Add RpcData as a built-in marshallable type.
  Add the full suite of RpcData types.
  Checkpoint adding @home RPC support to aidl
  ActivityManager: Make sure BOOT_COMPLETED Intent is sent when running headless
2012-02-10 11:50:10 -08:00
James Dong
8e9d67a135 Move away from MediaDebug and use ADebug instead
Change-Id: I963a3b6f79a7292891973cbeeaf3378b38629f08
2012-02-10 11:43:09 -08:00
Mike Lockwood
adf7c11e56 Merge "Quick and dirty test app for new SerialPort API" 2012-02-10 11:41:56 -08:00
Mike Lockwood
1e11c6519a Merge "New Serial Manager API:" 2012-02-10 11:41:41 -08:00
Dianne Hackborn
d262744b7e Merge "Some cruft removal." 2012-02-10 11:14:39 -08:00
Dianne Hackborn
21fbd1f7da Some cruft removal.
Change-Id: If4a94bfd4a033748eb13e8f3ff25e24382746778
2012-02-10 10:54:15 -08:00
Justin Ho
f59f92f1ac am 25d1d268: (-s ours) am 0fc225ed: am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '25d1d268c1b00734f4bdd7fcb85ced97645a7f29':
2012-02-10 10:51:52 -08:00
Mike Lockwood
d747dc8179 Fix problems dispatching media button events on headless devices
Signed-off-by: Mike Lockwood <lockwood@android.com>

Conflicts:

	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
2012-02-10 10:51:24 -08:00
Mike Lockwood
3a74bd36f8 Add headless mode for running the framework without the surface flinger
Enabled by setting system property ro.config.headless to 1
This will allow the framework to run without starting activities,
system UI and the keyguard.
Framework can still run services, content providers and broadcast receivers.

Signed-off-by: Mike Lockwood <lockwood@android.com>

Conflicts:

	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/PowerManagerService.java
	services/java/com/android/server/am/ActivityManagerService.java
2012-02-10 10:51:24 -08:00
Mike Lockwood
2395527c9b SettingsProvider: Allow overridding default value for Setttings.Secure.DEVICE_PROVISIONED
Signed-off-by: Mike Lockwood <lockwood@android.com>
2012-02-10 10:51:24 -08:00
Mike Lockwood
86aeb06635 Load lockscreen.disabled setting on database create as well as upgrade
Signed-off-by: Mike Lockwood <lockwood@android.com>
2012-02-10 10:51:24 -08:00
Mike Lockwood
c33d576661 SystemUI: Log an error instead of throwing an exception if navigation bar is enabled in tablet UI
Signed-off-by: Mike Lockwood <lockwood@android.com>
2012-02-10 10:51:24 -08:00
Mike Lockwood
7bef73900b SettingsProvider: Add support for overriding lockscreen.disabled default value
Signed-off-by: Mike Lockwood <lockwood@android.com>
2012-02-10 10:51:23 -08:00
Mike Lockwood
4b797dd8c1 Allow overriding default STAY_ON_WHILE_PLUGGED_IN setting value in an overlay
Signed-off-by: Mike Lockwood <lockwood@android.com>
2012-02-10 10:51:23 -08:00
Girts Folkmanis
d3622e9e49 Disable output processing when opening serial port.
If post processing is not disabled, we end up translating LF to CRLF, which
makes binary protocols sad.
2012-02-10 10:51:23 -08:00
Joe Onorato
28087c63d8 Update aidl for new Broker API. 2012-02-10 10:51:23 -08:00
Joe Onorato
a1c6d909c2 aidl: All flattenable types now must also be parcelable.
This is more a limitation of the grammar than anything else triggering laziness on my part.
2012-02-10 10:51:23 -08:00