summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Use hostname verifier directly instead of instance"Kenny Root2013-07-241-4/+1
|\
| * Use hostname verifier directly instead of instanceKenny Root2013-07-231-4/+1
| | | | | | | | | | | | | | | | | | Instead of local instance of the default HostnameVerifier, use it directly from HttpsURLConnection. This avoids class preloading creating an instance of it before it's necessary. Bug: 9984058 Change-Id: I780249dbd3c7bb346e1b275dcb68e4e2be7ebbbb
* | Exclude magic inner-class name from preloadKenny Root2013-07-231-2/+3
| | | | | | | | | | | | | | | | | | | | Add a magic subclass name that will exclude inner classes that are meant to prevent object instatiation but allow class preloading. This will allow classes that have undesired side-effects to delay initialization until the side-effects are no longer disruptive. Bug: 9984058 Change-Id: I46b0784760d84a2a2da1f9f41d87ee7f70a3fc16
* | Merge "Add WorkSource capability to LocationManager"David Christie2013-07-242-12/+60
|\ \
| * | Add WorkSource capability to LocationManagerDavid Christie2013-07-222-12/+60
| | | | | | | | | | | | Change-Id: I0fbbad0879b87ecc75a503bf7963356595bf4b96
* | | Merge "Updating the print dialog and its interactinos with the printing app."Svetoslav Ganov2013-07-246-661/+1081
|\ \ \
| * | | Updating the print dialog and its interactinos with the printing app.Svetoslav Ganov2013-07-236-661/+1081
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Added support for reporting the old print attributes during layout. Now we keep track of the old print attributes, so the app can compute the delta and decide whether re-layout work is needed. 2. Fixed PrintDocumentAdapter callback interleavings. Layout callbacks were intermixing with write ones - a mess. Now we make an attempt to cancel layout and write if they respond to cancellation, otherwise we wait but do not interleave them. 3. Refactored the PrintJobConfigActivity for easier maintenance and to have a single update UI method that does the minimal amount of work. Change-Id: I31ada1a0550882e6185018e6f17f923aed165d15
* | | | Merge "Fix default DNS not being set on network changes"Geremy Condra2013-07-241-4/+7
|\ \ \ \
| * | | | Fix default DNS not being set on network changesChad Brubaker2013-07-231-4/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I3c45404cab34c77b20dadc1d8aee127aa08fd0bd
* | | | | Merge "Fix bug that was causing us to lose total memory buckets."Dianne Hackborn2013-07-243-83/+158
|\ \ \ \ \
| * | | | | Fix bug that was causing us to lose total memory buckets.Dianne Hackborn2013-07-233-83/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When safely resetting stats after committing them, we were mistakenly clearing the current memory state so we would lose that total memory time until the memory state changes again. Also improve the summary output to print percentages, which make more sense for that display. Change-Id: I0fe45fd78e97ec8b94976170dd42f4ed345a5899
* | | | | | Merge "New permission to manage device admins"Amith Yamasani2013-07-245-2/+17
|\ \ \ \ \ \
| * | | | | | New permission to manage device adminsAmith Yamasani2013-07-225-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previously used permission was doing double duty as the permission that device admins to check for to ensure that calls are coming from valid system components. MANAGE_DEVICE_ADMINS is system|signature and is now required to add/remove device admins. Required for: Bug: 9856348 Change-Id: I64385d2ec734c3957af21b5a5d9cffd8a3bcd299
* | | | | | | Merge "Limit TYPE_SYSTEM_ERROR to system decor bounds."Craig Mautner2013-07-231-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Limit TYPE_SYSTEM_ERROR to system decor bounds.Craig Mautner2013-07-231-1/+2
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because windows of TYPE_SYTEM_ERROR lie in a layer above the Navigation Bar they cannot be allowed to extend into the Navigation Bar area or it will block touches to the Home button. Fixes bug 9626315 Change-Id: Ib5e4a2d2954cb79adc98d69e3c43108cb1389cc9
* | | | | | | Merge "Set task and activity types when adding to task."Craig Mautner2013-07-232-6/+10
|\ \ \ \ \ \ \
| * | | | | | | Set task and activity types when adding to task.Craig Mautner2013-07-232-6/+10
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Activities from the home package were causing tasks types to change from application to home. This was not the intention of setting the task type when adding an activity. This change sets the task type to the inherent type of the first activity added. All subsequent activities added to the task then inherent the task's type overriding the inherent type of the task. Fixes bug 9972495. Change-Id: Ib77675aea790ea64d4f166af62c7138e89356c13
* | | | | | | Merge "Re-use "name" attribute for NFC AIDs."Martijn Coenen2013-07-233-3/+1
|\ \ \ \ \ \ \
| * | | | | | | Re-use "name" attribute for NFC AIDs.Martijn Coenen2013-07-223-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I92895e0f21a639897c45ec184580c43ba8b22dca
* | | | | | | | Merge "Fix handling of ListPreference.setValue()"Alan Viverette2013-07-231-4/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix handling of ListPreference.setValue()Alan Viverette2013-07-231-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, setValue() was not calling notifyChanged(). This prevented the summary from updating correctly. Now it calls notifyChanged() the first time it's called and when the value actually changes. BUG: 9987962 Change-Id: I02dd4be6bde2969f39d30921a62a7ba908128e0e
* | | | | | | | | Add support for notification scorers.Scott Greenwald2013-07-236-6/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL adds an interface and classes for scoring notifications. The NotificationManagerService initializes an array of scorers specified as a resource. When a Notification is enqueued, the getScore() method is called successively on the scorers, each getting the Notification to be scored, and the score outputted by the previous scorer. At present there is a single scorer which prioritizes Notifications that mention the display name of a starred contact. To turn off the StarredContactNotificationScorer: adb shell settings put global contact_scorer_enabled 0 Change-Id: Ic16c80952e7c85bdde292ebb3f7900efb01f2e29
* | | | | | | | | Merge "Add controller numbers for gamepads / joysticks"Michael Wright2013-07-238-37/+117
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add controller numbers for gamepads / joysticksMichael Wright2013-07-238-37/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I30ac9add6a2473a5ebd83a022c571545e61d1136
* | | | | | | | | | Merge "Use switch in callback handler for events, and no EVENT_MORE_DATA"Glenn Kasten2013-07-232-13/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use switch in callback handler for events, and no EVENT_MORE_DATAGlenn Kasten2013-07-222-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EVENT_MORE_DATA is no longer possible for the transfer mode used by Java. Change-Id: Iffd98bca8adea7e066d5d069e82aa841e5c02330
* | | | | | | | | | | Merge "allow rich notifications in the heads up."Chris Wren2013-07-2315-191/+275
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | allow rich notifications in the heads up.Chris Wren2013-07-2315-191/+275
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new shouldInterrupt logic: screen on, not locked, not dreaming, and priority above HIGH and noisy, or has fullscreen intent draft of API allowing devs to give hints about head up display reuse inflateViews() add an expand helper to the heads up space move some things into Entry for reuse don't allow touches in first second delay decay if touched make decay time a resource add a custom viewgroup for notification rows to get view management out of the NotificationData class. Change-Id: I36464f110cfa0dabc3f35db7db6c35c27e8ee2ba
* | | | | | | | | | | Merge "Fix crash in app widgets Bug #9983130"Romain Guy2013-07-231-1/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix crash in app widgetsRomain Guy2013-07-231-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #9983130 Change-Id: Ie2319c9e8f6e7591c03061224021973b94ae07cb
* | | | | | | | | | | | am 369d1980: am 9aaa8f30: am 0acf946b: Doc change: Add Colopl video to ↵Dirk Dougherty2013-07-231-37/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | carousel and spotlight. cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93 * commit '369d1980b9a3a31111c5c993d7cab289b511f835': Doc change: Add Colopl video to carousel and spotlight. cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
| * | | | | | | | | | | am 9aaa8f30: am 0acf946b: Doc change: Add Colopl video to carousel and ↵Dirk Dougherty2013-07-231-37/+12
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spotlight. cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93 * commit '9aaa8f30393413a5a52c4494146b35de3124d8a0': Doc change: Add Colopl video to carousel and spotlight. cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
| | * \ \ \ \ \ \ \ \ \ \ am 0acf946b: Doc change: Add Colopl video to carousel and spotlight. ↵Dirk Dougherty2013-07-231-37/+12
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93 * commit '0acf946bb4968416d123ced337d8bb42eb17df8b': Doc change: Add Colopl video to carousel and spotlight. cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
| | | * | | | | | | | | | | Doc change: Add Colopl video to carousel and spotlight.Dirk Dougherty2013-07-231-37/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93 Change-Id: I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
* | | | | | | | | | | | | | Add "adb shell am restart" command.Dianne Hackborn2013-07-236-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So you can restart the system without being root. Change-Id: I89770f497833ecbe2b69e3a0cfafae7ef472a9f5
* | | | | | | | | | | | | | Merge "Add new facility for apps to declared their preferred intents."Dianne Hackborn2013-07-233-95/+226
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add new facility for apps to declared their preferred intents.Dianne Hackborn2013-07-223-95/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an extension from the existing data/etc/perferred-apps facility. Now applications pre-installed on the system image can declare which intents they would like to be considered the preferred app for. When the system firsts initializes, or the application settings are reset, these are used to configured the current preferred app settings appropriately. You use this with a new <preferred> tag under your activity, which indicates which intents you would like to be the preferred handler for. The syntax for this is written much like an intent filter, however semantically it is not really an intent filter and so has some important differences: - You can not use globbing patterns (for SSPs or paths). - You can use only one action (if you use more than one it will only use the first one, so be careful). Semantically what this is actually used for is a template from which to generate a set of Intent objects, which are used to probe the current environment in order to see if there are multiple activities that can handle the Intent and, if so, generate a new preferred setting for that pointing to your app. As an example, here is how the preferred tag might be written for the Maps application: <preferred> <action android:name="android.intent.action.VIEW" /> <category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.BROWSABLE" /> <data android:scheme="http" /> <data android:scheme="https" /> <data android:host="maps.google.com" /> <data android:path="/" /> <data android:pathPrefix="/maps" /> </preferred> <preferred> <action android:name="android.intent.action.VIEW" /> <category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.BROWSABLE" /> <data android:scheme="geo" /> </preferred> From this, we generate the following set of potential Intents to be matched, all with ACTION_VIEW, CATEGORY_DEFAULT+CATEGORY_BROWSABLE: Change-Id: I7fd42aec8b6109c7dd20012529662362f1b7437a http://maps.google.com/ http://maps.google.com/maps https://maps.google.com/ https://maps.google.com/maps geo:
* | | | | | | | | | | | | | | Merge "switch to v3 for NetworkLocator overlay, compatible with gcore FINN"Stan Chesnutt2013-07-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | switch to v3 for NetworkLocator overlay, compatible with gcore FINNStan Chesnutt2013-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://b/8245654 Change-Id: I2ff95b3b9e138b57bc630f760476bbb7d748342a
* | | | | | | | | | | | | | | | Merge "Fix supplimentary network connections with VPNs"Geremy Condra2013-07-234-37/+118
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix supplimentary network connections with VPNsChad Brubaker2013-07-194-37/+118
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables the use of supplimentary mobile networks like MMS, and HIPRI while VPNs are running. Change-Id: I313f57a905b4e16bd4322c68687cbff1cfbe9d3e
* | | | | | | | | | | | | | | | Merge "Support multiple Vpn ManageDialogs"Geremy Condra2013-07-235-7/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Support multiple Vpn ManageDialogsChad Brubaker2013-07-165-7/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move away from storing the configs in the Intent to prevent issues with PendingIntents and multiple configs. The Dialog now queries ConnectivityService for the configuration to display in the management dialog. Change-Id: I0e0ef52db840152914d117a24f776d8106e836ff
* | | | | | | | | | | | | | | | | Merge "MediaFrameworkTest: Fix camera unit test failure"Zhijun He2013-07-231-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | MediaFrameworkTest: Fix camera unit test failureZhijun He2013-07-221-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for testSubmitStreamingRequest failure Change-Id: I2e22a56b3da90112a668c2185b05eb9288cde392
* | | | | | | | | | | | | | | | | Merge "Replace run-time PCM encodings by compile-time constants"Glenn Kasten2013-07-231-21/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Replace run-time PCM encodings by compile-time constantsGlenn Kasten2013-07-191-21/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify the code to use the constant values of ENCODING_PCM_16BIT and ENCODING_PCM_8BIT from AudioFormat.java. There is already a comment in AudioFormat.java saying that these symbols need to be kept in sync with this file, and they are public static final so they can never be changed. This change is similar to commit 3d301cb2b1d9e61c3af8a8b0b9db370d3d7abf77 or Change-Id I6cb10ac511df4845610454d1659e64d9195d67cd Change-Id: Ib62d8cfeb6261ffd362dba3600d593e2a268d76a
* | | | | | | | | | | | | | | | | | Merge "Remove unused includes"Glenn Kasten2013-07-233-22/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Remove unused includesGlenn Kasten2013-07-223-22/+0
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id9842fe092aba2761c0641c76ad06749b2e1d9b3
* | | | | | | | | | | | | | | | | | Merge "Use the utility logging methods and single tag"Glenn Kasten2013-07-231-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \