OSDN Git Service
Glenn Kasten [Fri, 10 Feb 2012 23:28:45 +0000 (15:28 -0800)]
Merge "Mark fields const if only set in constructor"
Mike Lockwood [Fri, 10 Feb 2012 23:26:36 +0000 (15:26 -0800)]
Merge changes Iefeba018,I1ce5b26d,Ie3f59793,Id3c5e1ec,I9063154a,Ib7bd88a3,I20963df8,I01060b08,I7dc29739,I5c55a051,Ia07aa3c4,I3194ea94,I0dc37cce,Ic3a7bb65,I0a7eaecf,Ifa7b0614,Ice952c8e,Ia5abdb9e,Ifcb310f9,If5f4ec97,I4767690f,I79824179,I6e0f981e,Id60ae7f6
* changes:
EthernetDataTracker: Don't run DHCP or set network available until link is up
Only send master volume or mute updates if the settings have changed
Make AudioManager.adjustMasterVolume public and hidden
Allow disabling network stats support in a resource overlay
Restore persisted master volume if the media server restarts
Don't allow changing master volume when muted
Show the flags in package manager debugging.
Modified the constructor of EndpointBase
Add a getEndpointInfo accessor to AIDL-generated RPC proxy classes
Defer persisting master data to avoid excessive database writes
Add an option that disables the AUDIO_BECOMING_NOISY intent send when a headset is hotplugged.
Remove reference counting and client death notification for master mute
AudioService: Send broadcasts when master volume and mute state change
Use the new get/putFlattenable methods on RpcData.
Don't try to unmarshal void return types when there are out parameters being returned.
AudioManager: Add wrapper methods for master volume support
AudioManager: Add support for master mute
NetworkTimeUpdateService: Schedule NTP on ethernet connect as well as wifi
For events, require that the parameters be marked in.
PhoneWindowManager: stifle warning that ITelephony service does not exist
AudioManager: transparently convert volume settings for other streams to master volume if config_useMasterVolume is set.
Support putting Flattenables in Lists.
Was generating code that uses the wrong RpcData.
store the hw addr in the extraInfo field of ethernet NetworkInfos
Svetoslav Ganov [Fri, 10 Feb 2012 23:13:26 +0000 (15:13 -0800)]
Merge "UI automation service disconnected upon package change."
Alex Sakhartchouk [Fri, 10 Feb 2012 23:00:21 +0000 (15:00 -0800)]
Merge "Making shader compilation errors throw a Java exception."
Amith Yamasani [Fri, 10 Feb 2012 22:34:52 +0000 (14:34 -0800)]
Merge "Multi-user - wallpaper service"
James Dong [Fri, 10 Feb 2012 22:17:06 +0000 (14:17 -0800)]
Merge "Move away from MediaDebug and use ADebug instead"
Jason Sams [Fri, 10 Feb 2012 21:51:04 +0000 (13:51 -0800)]
Merge "Start implementing SurfaceTexture streaming into RS allocations."
Glenn Kasten [Fri, 10 Feb 2012 21:36:24 +0000 (13:36 -0800)]
Merge "No newline or space at end of ALOG format string"
Glenn Kasten [Fri, 10 Feb 2012 21:33:31 +0000 (13:33 -0800)]
Merge "Move declaration of stream_type_t up earlier"
Glenn Kasten [Fri, 10 Feb 2012 21:33:02 +0000 (13:33 -0800)]
Merge "Fix typos in ALOG for pid vs tid"
Glenn Kasten [Fri, 10 Feb 2012 21:30:24 +0000 (13:30 -0800)]
Merge "Rename type() to streamType()"
Eric Fischer [Fri, 10 Feb 2012 21:15:26 +0000 (13:15 -0800)]
am
5b6f9bf5: (-s ours) am
8b6d7b06: am
650462bb: Import revised translations. DO NOT MERGE
* commit '
5b6f9bf51c13532acac782a23506cb0b783b8876':
Eric Fischer [Fri, 10 Feb 2012 21:15:23 +0000 (13:15 -0800)]
am
ffb2473b: (-s ours) am
a2c92418: am
650462bb: Import revised translations. DO NOT MERGE
* commit '
ffb2473b3bd8a4986e41ff0a711e708656432eaf':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 21:13:58 +0000 (13:13 -0800)]
am
8b6d7b06: am
650462bb: Import revised translations. DO NOT MERGE
* commit '
8b6d7b063b5a94b59b4a1132763f4644ee1d8545':
Eric Fischer [Fri, 10 Feb 2012 21:13:30 +0000 (13:13 -0800)]
am
a2c92418: am
650462bb: Import revised translations. DO NOT MERGE
* commit '
a2c9241869c14a058621668d65ca29fc8a867bbf':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 21:11:46 +0000 (13:11 -0800)]
am
650462bb: Import revised translations. DO NOT MERGE
* commit '
650462bbfd6218c918cd9507ea0a33fa9a936f26':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 21:11:45 +0000 (13:11 -0800)]
am
650462bb: Import revised translations. DO NOT MERGE
* commit '
650462bbfd6218c918cd9507ea0a33fa9a936f26':
Import revised translations. DO NOT MERGE
Dianne Hackborn [Fri, 10 Feb 2012 21:07:54 +0000 (13:07 -0800)]
Merge "Clean up and expose LongSparseArray."
Mike Lockwood [Fri, 10 Feb 2012 21:05:13 +0000 (13:05 -0800)]
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
Mike Lockwood [Fri, 10 Feb 2012 21:03:24 +0000 (13:03 -0800)]
Merge "BatteryService: Don't fail to register native methods if kernel power supply driver is missing"
Eric Fischer [Fri, 10 Feb 2012 20:54:21 +0000 (12:54 -0800)]
Merge "Import translations."
Mike Lockwood [Fri, 10 Feb 2012 19:50:10 +0000 (11:50 -0800)]
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
Mike Lockwood [Fri, 10 Feb 2012 19:41:56 +0000 (11:41 -0800)]
Merge "Quick and dirty test app for new SerialPort API"
Mike Lockwood [Fri, 10 Feb 2012 19:41:41 +0000 (11:41 -0800)]
Merge "New Serial Manager API:"
Dianne Hackborn [Fri, 10 Feb 2012 19:14:39 +0000 (11:14 -0800)]
Merge "Some cruft removal."
Justin Ho [Fri, 10 Feb 2012 18:51:52 +0000 (10:51 -0800)]
am
25d1d268: (-s ours) am
0fc225ed: am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
25d1d268c1b00734f4bdd7fcb85ced97645a7f29':
Justin Ho [Fri, 10 Feb 2012 18:49:48 +0000 (10:49 -0800)]
am
0fc225ed: am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
0fc225ed37ec535ff9b5238f390a79dbaf7f377b':
Justin Ho [Fri, 10 Feb 2012 18:19:58 +0000 (10:19 -0800)]
am
f994f353: (-s ours) am
448249d1: (-s ours) am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
f994f353f705dc69c1e57bd6785092218fd630d2':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:13:19 +0000 (10:13 -0800)]
am
448249d1: (-s ours) am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
448249d1a7e0b871b9a9db49a45e0e51f6d36d65':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:10:39 +0000 (10:10 -0800)]
am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
744c5b0bdee6a26e2dc7e740a695d53c32104326':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:09:42 +0000 (10:09 -0800)]
am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
744c5b0bdee6a26e2dc7e740a695d53c32104326':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:07:07 +0000 (10:07 -0800)]
Merge "Import translations. DO NOT MERGE" into ics-mr1
Marco Nelissen [Fri, 10 Feb 2012 15:13:23 +0000 (07:13 -0800)]
Merge "Fix "dumpsys activity provider""
satok [Fri, 10 Feb 2012 10:22:57 +0000 (02:22 -0800)]
Merge "Add an api to switch to the next IME and subtype"
James Dong [Fri, 10 Feb 2012 07:53:50 +0000 (23:53 -0800)]
Merge "move away from MediaDebug and use ADebug instead for video editor engine"
Scott Main [Fri, 10 Feb 2012 05:09:01 +0000 (21:09 -0800)]
Joe Fernandez [Fri, 10 Feb 2012 05:08:59 +0000 (21:08 -0800)]
am
d2deae8f: am
a300ea98: am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
d2deae8f40d33ad69d92963a7fceb90ee3cae1ad':
Scott Main [Fri, 10 Feb 2012 05:08:58 +0000 (21:08 -0800)]
am
758fe151: am
cf18f420: am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
758fe1511e499099deddcb94994b5d9a332062e1':
Scott Main [Fri, 10 Feb 2012 05:07:10 +0000 (21:07 -0800)]
Joe Fernandez [Fri, 10 Feb 2012 05:07:08 +0000 (21:07 -0800)]
am
a300ea98: am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
a300ea98df80a2d72d6131902a8fb3dbf9a6ed14':
Scott Main [Fri, 10 Feb 2012 05:07:08 +0000 (21:07 -0800)]
am
cf18f420: am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
cf18f42026b6dea9e1ec2f243718a6b7aebae3a2':
Dianne Hackborn [Fri, 10 Feb 2012 02:08:38 +0000 (18:08 -0800)]
Merge "Some hardening of isolated processes by restricting access to services."
Dianne Hackborn [Fri, 10 Feb 2012 00:12:18 +0000 (16:12 -0800)]
Some hardening of isolated processes by restricting access to services.
Services now must explicitly opt in to being accessed by isolated
processes. Currently only the activity manager and surface flinger
allow this. Activity manager is needed so that we can actually
bring up the process; SurfaceFlinger is needed to be able to get the
display information for creating the Configuration. The SurfaceFlinger
should be safe because the app doesn't have access to the window
manager so can't actually get a surface to do anything with.
The activity manager now protects most of its entry points against
isolated processes.
Change-Id: I0dad8cb2c873575c4c7659c3c2a7eda8e98f46b0
Fabrice Di Meglio [Fri, 10 Feb 2012 01:35:21 +0000 (17:35 -0800)]
Merge "Update BiDiTests app"
Scott Main [Fri, 10 Feb 2012 00:06:31 +0000 (16:06 -0800)]
Scott Main [Fri, 10 Feb 2012 00:04:15 +0000 (16:04 -0800)]
am
db7da7ee: am
d9c8bbd5: docs: fix xss issue bug
5125642
* commit '
db7da7ee40231225861f4d39ea2f256bbca06f24':
docs: fix xss issue bug
5125642
Scott Main [Fri, 10 Feb 2012 00:01:51 +0000 (16:01 -0800)]
am
d9c8bbd5: docs: fix xss issue bug
5125642
* commit '
d9c8bbd56a9c76a111f9441871e79516c521aa75':
docs: fix xss issue bug
5125642
Scott Main [Fri, 10 Feb 2012 00:01:38 +0000 (16:01 -0800)]
am
d9c8bbd5: docs: fix xss issue bug
5125642
* commit '
d9c8bbd56a9c76a111f9441871e79516c521aa75':
docs: fix xss issue bug
5125642
James Dong [Thu, 9 Feb 2012 23:22:58 +0000 (15:22 -0800)]
Merge "Finish up B frame support in MPEG4Writer"
Jason Sams [Thu, 9 Feb 2012 23:17:27 +0000 (15:17 -0800)]
Merge "Remove unused param."
Andreas Huber [Thu, 9 Feb 2012 22:52:58 +0000 (14:52 -0800)]
Merge "Experiment with seeking to closest frame instead of closest syncframe"
Joe Fernandez [Thu, 9 Feb 2012 21:51:00 +0000 (13:51 -0800)]
am
4f21e3a0: am
20b9c795: am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
4f21e3a08adefbb5e109e2f844386ed844c1c436':
docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)
Joe Fernandez [Thu, 9 Feb 2012 21:48:46 +0000 (13:48 -0800)]
am
20b9c795: am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
20b9c795d4dedaabac335eb5bcd8f7ba32e38af3':
docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)
Joe Fernandez [Thu, 9 Feb 2012 21:46:55 +0000 (13:46 -0800)]
am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
1c66faab73b2ce54bfe362f3c051ce95ed89fb22':
docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)
Joe Fernandez [Thu, 9 Feb 2012 21:46:41 +0000 (13:46 -0800)]
am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
1c66faab73b2ce54bfe362f3c051ce95ed89fb22':
docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)
Joe Fernandez [Thu, 9 Feb 2012 21:45:01 +0000 (13:45 -0800)]
Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
Scott Main [Thu, 9 Feb 2012 20:53:12 +0000 (12:53 -0800)]
am
ec12ae99: am
79cfde69: am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
ec12ae9933e463181338834387caa7c58b330635':
docs: fix misc doc bugs from external issue tracker
Scott Main [Thu, 9 Feb 2012 20:50:18 +0000 (12:50 -0800)]
am
79cfde69: am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
79cfde69fdd9952d51d4d9915c8b7fca98331e2c':
docs: fix misc doc bugs from external issue tracker
Scott Main [Thu, 9 Feb 2012 20:48:18 +0000 (12:48 -0800)]
am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
52bfc243684b2f340da326aaa38e9021e4e3b2e6':
docs: fix misc doc bugs from external issue tracker
Scott Main [Thu, 9 Feb 2012 20:48:08 +0000 (12:48 -0800)]
am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
52bfc243684b2f340da326aaa38e9021e4e3b2e6':
docs: fix misc doc bugs from external issue tracker
Eric Fischer [Thu, 9 Feb 2012 19:37:18 +0000 (11:37 -0800)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Thu, 9 Feb 2012 19:26:02 +0000 (11:26 -0800)]
Merge "Import translations. DO NOT MERGE"
Dianne Hackborn [Thu, 9 Feb 2012 19:20:07 +0000 (11:20 -0800)]
Merge "Add new feature for running services in "isolated" sandbox processes."
Jamie Gennis [Thu, 9 Feb 2012 19:08:02 +0000 (11:08 -0800)]
Merge "Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue."
Steve Block [Thu, 9 Feb 2012 11:04:49 +0000 (03:04 -0800)]
Merge "Clarify comments for WebSettings."
Justin Ho [Wed, 8 Feb 2012 20:59:17 +0000 (12:59 -0800)]
Merge "Tentative fix for mysteriously recycled bitmap"
Dianne Hackborn [Wed, 8 Feb 2012 19:38:23 +0000 (11:38 -0800)]
Merge "Don't wait for current activity to pause before resuming next."
James Dong [Wed, 8 Feb 2012 18:42:35 +0000 (10:42 -0800)]
Merge "Enable B frame support in MPEG4Writer"
Glenn Kasten [Wed, 8 Feb 2012 18:27:58 +0000 (10:27 -0800)]
Merge "Combine duplicate code & document wp<> in mClients"
Gilles Debunne [Wed, 8 Feb 2012 18:27:46 +0000 (10:27 -0800)]
Merge "Invalidate text display list when text properties change."
Glenn Kasten [Wed, 8 Feb 2012 18:22:11 +0000 (10:22 -0800)]
Merge "Use audio_io_handle_t consistently instead of int"
Marco Nelissen [Wed, 8 Feb 2012 18:15:01 +0000 (10:15 -0800)]
Merge "Delete entries in bulk"
Glenn Kasten [Wed, 8 Feb 2012 17:37:26 +0000 (09:37 -0800)]
Merge "Effect UUID inputs passed by pointer are const"
Wink Saville [Wed, 8 Feb 2012 17:19:19 +0000 (09:19 -0800)]
Merge "Add ril.test.emergency system property."
Glenn Kasten [Wed, 8 Feb 2012 16:40:28 +0000 (08:40 -0800)]
Merge "Use pid_t not int"
Glenn Kasten [Wed, 8 Feb 2012 16:40:15 +0000 (08:40 -0800)]
Merge "Don't double destruct audio_track_cblk_t"
Glenn Kasten [Wed, 8 Feb 2012 16:39:39 +0000 (08:39 -0800)]
Merge "AudioFlinger methods const and inline"
Glenn Kasten [Wed, 8 Feb 2012 16:34:33 +0000 (08:34 -0800)]
Merge "Remove dead mutex in AudioTrack/AudioRecord thread"
Glenn Kasten [Wed, 8 Feb 2012 16:33:41 +0000 (08:33 -0800)]
Merge "Use virtual destructors"
Glenn Kasten [Wed, 8 Feb 2012 15:45:15 +0000 (07:45 -0800)]
Merge "Improve performance for sp<> on stack"
Glenn Kasten [Wed, 8 Feb 2012 15:42:40 +0000 (07:42 -0800)]
Merge "AudioTrack declare more methods const"
Glenn Kasten [Wed, 8 Feb 2012 15:41:44 +0000 (07:41 -0800)]
Merge "Use 0 not NULL for sp<> and wp<>"
Glenn Kasten [Wed, 8 Feb 2012 15:40:23 +0000 (07:40 -0800)]
Merge "Use bool instead of int"
Glenn Kasten [Wed, 8 Feb 2012 15:39:27 +0000 (07:39 -0800)]
Merge "Declare more IAudioFlinger methods const"
Glenn Kasten [Wed, 8 Feb 2012 15:38:42 +0000 (07:38 -0800)]
Merge "Remove dead code"
Scott Main [Wed, 8 Feb 2012 05:52:27 +0000 (21:52 -0800)]
Scott Main [Wed, 8 Feb 2012 05:52:24 +0000 (21:52 -0800)]
am
f8274e50: am
8561a6b0: am
09ff04d7: docs: fix typo in menu TOC
* commit '
f8274e506c1e4ef798554244370daf57cc88ecdb':
docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:50:20 +0000 (21:50 -0800)]
Scott Main [Wed, 8 Feb 2012 05:49:37 +0000 (21:49 -0800)]
am
8561a6b0: am
09ff04d7: docs: fix typo in menu TOC
* commit '
8561a6b0c5e0fbec7101108bf480f2adb485f2bc':
docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:48:03 +0000 (21:48 -0800)]
am
09ff04d7: docs: fix typo in menu TOC
* commit '
09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:47:38 +0000 (21:47 -0800)]
am
09ff04d7: docs: fix typo in menu TOC
* commit '
09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
docs: fix typo in menu TOC
Guang Zhu [Wed, 8 Feb 2012 03:42:07 +0000 (19:42 -0800)]
Merge "Revert "Make NDC not block forever and handle restart.""
Jason Sams [Wed, 8 Feb 2012 02:56:39 +0000 (18:56 -0800)]
Merge "Fix bug in generated code for functions with inband data from pointers. Passing zero length data would desync return command stream."
Romain Guy [Wed, 8 Feb 2012 02:22:43 +0000 (18:22 -0800)]
Merge "Fix the system"
Fabrice Di Meglio [Wed, 8 Feb 2012 01:49:47 +0000 (17:49 -0800)]
Merge "Fix bug #
5979311 Change TextView to not clip top/bottom text"
Romain Guy [Wed, 8 Feb 2012 01:07:00 +0000 (17:07 -0800)]
Merge "Preliminary support for clipRect(Rect, Op)"
Romain Guy [Wed, 8 Feb 2012 01:04:34 +0000 (17:04 -0800)]
Preliminary support for clipRect(Rect, Op)
This adds basic support for clip regions. It is currently disabled at compile
time. Enabling clip regions will require setting up a stencil buffer.
Change-Id: I638616a972276e38737f8ac0633692c3845eaa74
Robert Greenwalt [Wed, 8 Feb 2012 00:19:56 +0000 (16:19 -0800)]
Merge "Make NDC not block forever and handle restart."
Wink Saville [Tue, 7 Feb 2012 23:56:23 +0000 (15:56 -0800)]
Merge "Fix INTENT_RECONNECT_ALARM_EXTRA_xx, make strings meaningful."
Jeff Sharkey [Tue, 7 Feb 2012 23:50:02 +0000 (15:50 -0800)]
Merge "Send broadcast when changing restrict background."