Merge commit 'a7251991ffb6a26e4cf23e60633c8250c78bd9df'
* commit 'a7251991ffb6a26e4cf23e60633c8250c78bd9df':
Invoke getSystem.updateConfiguration when binding an application to
* changes:
Invoke getSystem.updateConfiguration when binding an application to update config changes in Resources.mSystem Since Resources is preloaded in the zygote, system resources in Resources need to be updated with config changes every time an application is started
Merge commit '0bcfc537e81b959a7d674deea4a5aee7f5c6eb2d'
* commit '0bcfc537e81b959a7d674deea4a5aee7f5c6eb2d':
Fixes#1940839. Prevents NPE in RelativeLayout when a non-existing View is
* Changes
+ Add PptpProfile.java, PptpService.java.
+ Add L2tpIpsecPskProfile.java
+ Add PPTP and L2TP_IPSEC_PSK entries in VpnType.java.
+ Add the secret option to L2tpProfile.java and have L2tpIpsecProfile
extend it.
+ Add MtpdHelper to send common PPP options.
+ Add getGatewayIp() to VpnService().
+ Revise VpnService.reallyGetHostIp().
Patch Set 6, 7, 8:
+ Add L2TP secret flag in L2tpProfile.
Patch Set 9:
+ Add description to VpnType.
Patch Set 11:
+ Pass ipparam to mtpd.
Patch Set 12:
+ Add L2TP secret support
+ Fix string constants
update config changes in Resources.mSystem
Since Resources is preloaded in the zygote, system resources in Resources
need to be updated with config changes every time an application is started
Merge commit 'd4eac5f3840de7ddf084a36053d8e63766b4a0f7'
* commit 'd4eac5f3840de7ddf084a36053d8e63766b4a0f7':
Using a sendBroadcast to notify interested parties of when
Previously only the level was being updated, resulting in out of date values
being left in the cache.
Patch was provided by Motorola.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'f881762f97c74253bbc7f629380bb65739457041'
* commit 'f881762f97c74253bbc7f629380bb65739457041':
Add a method to Process to get uid for a pid.
This makes ProviderTestCase2 work better by enabling code under test
to make calls to context.getDatabasePath(). Without this fix the call
throws an exception.
It would be reasonable (and useful) to backport this to donut, but I'm
not even building donut these days.
Previously, when call waiting is ignored by user or timed out
by PhoneApp, the connection object for call waiting does not
release the wake lock. It causes the phone process to crash
randomly.
The fix is to release the wake lock when call waiting is
ignored by user or timed out by PhoneApp.
Merge commit 'c6a482e778e7b5fc5790edf22e554c93f53b1112'
* commit 'c6a482e778e7b5fc5790edf22e554c93f53b1112':
Only remove client after the hardware is teared down, so a new client
Merge commit '83b8678dd4cc78dc89fe853161bd470ef28561c8'
* commit '83b8678dd4cc78dc89fe853161bd470ef28561c8':
Add new APIs to LauncherActivity to be used elsewhere.
These changes are the frameworks/base portion of CDMA UI changes.
Five settings are added:
- In-call DTMF type (burst or long)
- Emergency tone type
- CDMA auto-retry
- Hearing Aid Compatibility (on/off)
- TTY mode
Merge commit 'c7410f6f9f8f2aeb9368502a4a725b1a7abe1190'
* commit 'c7410f6f9f8f2aeb9368502a4a725b1a7abe1190':
Add includes to enable host C++ tools to compile with GCC 4.4
Otherwise printf is undeclared. These files worked with earlier versions
of gcc because either cstdio or stdio.h was being included by some other
header file. But this was not guaranteed behavior, so with GCC 4.4 there
are errors. The fix is backwards compatible with earlier versions of GCC.
This change includes either <cstdio> or <stdio.h> whichever looks more
appropriate given the other headers included by the given source file.
Note, I'm using "GCC" to mean Gnu Compile Collection, as this problem is
specific to C++ source files. (Presumably a C++-specific header file
changed to no longer include cstdio.)
Merge commit 'ad39eb0a2555762a1d9157f8017097579d14f39d'
* commit 'ad39eb0a2555762a1d9157f8017097579d14f39d':
Add includes to enable host C++ tools to compile with GCC 4.4
Otherwise printf is undeclared. These files worked with earlier versions
of gcc because either cstdio or stdio.h was being included by some other
header file. But this was not guaranteed behavior, so with GCC 4.4 there
are errors. The fix is backwards compatible with earlier versions of GCC.
This change includes either <cstdio> or <stdio.h> whichever looks more
appropriate given the other headers included by the given source file.
Note, I'm using "GCC" to mean Gnu Compile Collection, as this problem is
specific to C++ source files. (Presumably a C++-specific header file
changed to no longer include cstdio.)
