Merge commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2'
* commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2':
Fix some backup reader/writer issues; make local transport do backup
Fix the jni initializer.
Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput.
Fix bug #1812041: activity manager crash with bad args.
Journal backup requests so that they won't be lost in a crash
Fix data connection issues.
Merge commit '6599426f74371c823fcfe570f61577262eb0df44'
* commit '6599426f74371c823fcfe570f61577262eb0df44':
Make the date format preference work again.
Merge commit 'e8939bb8f1453b44788d4475a8263082d858e533'
* commit 'e8939bb8f1453b44788d4475a8263082d858e533':
AI 149797: Have SetupWizard pull the Terms of Service from the web using a new URL
Merge commit '110b50ca5158f75abdead740f0956600da2f212d' into donut
* commit '110b50ca5158f75abdead740f0956600da2f212d':
AI 149839: make the home page's announcement block expandable...
Merge commit '83bb56c389d003162093eef0aaee251cefc1deed'
* commit '83bb56c389d003162093eef0aaee251cefc1deed':
Add the VPN services package, VPN service base classes and L2tpIpsecService.
Merge commit '78f0f8cb2efe9410127c39201e240f6d438eb53c'
* commit '78f0f8cb2efe9410127c39201e240f6d438eb53c':
Make the file backup helper not crash if a file you requested
Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.
Merge commit 'f229aff118dc53c3a06f0b4120d9ce22f4c2dd6e'
* commit 'f229aff118dc53c3a06f0b4120d9ce22f4c2dd6e':
Update control files (pass/fail/nontext/crash) to results from CRB45
Merge commit 'cb9534f92007b47d86cccc306dc75ca2d64bd197'
* commit 'cb9534f92007b47d86cccc306dc75ca2d64bd197':
Support SMS cell broadcasting for GSM in RIL.java
Merge commit '35733757bd1644f1fd67dc3a055391d1f167c4f2'
* commit '35733757bd1644f1fd67dc3a055391d1f167c4f2':
Hook the 12- or 24-hour time format checkbox back up.
Also add android.security.Keystore. This is a quick solution. Will be
evolved to a more mature implementation.
PATCH SET 2:
+ Add VpnServiceBinder to hide VpnService and its subclasses.
+ Add sendCommand2() to AndroidServiceProxy to work with the latest mtpd.
PATCH SET 3:
+ Rebase to catch up with new commits; no changes made.
PATCH SET 4:
+ Remove/comment out @Override on interface methods to be compilable for Java 1.5.
PATCH SET 5:
+ Add L2tpService.java.
+ Make VpnService to work on SingleServerProfile; add serverIp to
connect(); set system property "net.vpn.server_ip"; and move
getPppOptionFilePath() from L2tpIpsecService to VpnService
+ Revise VpnManager to start VpnService without worrying about which
type (as the type info is in VpnProfile)
+ Remove installation stuff from VpnManager
PATCH SET 6:
+ Fix PATCH SET 5 (the patch was messed up). Please ignore PATCH SET 5.
PATCH SET 7:
+ Fix styles.
PATCH SET 8:
+ Add CANCELLED to VpnState.
PATCH SET 9:
+ Make VpnProfile serializable (in order to save them to persistent storage)
PATCH SET 10:
+ Remove Keystore.java as it's added in another CL.
* changes:
Make the file backup helper not crash if a file you requested can't be stated. This means you don't need to know if the files you are backing up exist or not -- we'll figure it out for you.
Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.
* changes:
TextToSpeech class cleanups - harmonized private member variable names - added success / failure codes (used for now in initialization) - synchronized access to speech completed listener.
Merge commit '286ea605c991874fb43a6a205676a0ca404f94cc'
* commit '286ea605c991874fb43a6a205676a0ca404f94cc':
Renaming the Tts class to TextToSpeech for clarity.
