summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-devRobert Greenwalt2013-04-112-6/+11
|\
| * Use CONNECTIVITY_INTERNAL for global proxyRobert Greenwalt2013-04-102-6/+11
| | | | | | | | | | | | | | | | | | The Global http proxy shouldn't be used by apps, but can be useful in certain conditions. bug:8264794 bug:8557674 Change-Id: Ia3cbe542e448d9e74d0492626a13e9fd34ad797a
* | Merge "Optional <uses-permission> not yet supported." into jb-mr2-devNick Kralevich2013-04-115-4/+8
|\ \
| * | Optional <uses-permission> not yet supported.Nick Kralevich2013-04-115-4/+8
| | | | | | | | | | | | Change-Id: Ieaa97a29db75161f35905ff340b2c525bbf50612
* | | Merge "Trace: unhide app tracing APIs" into jb-mr2-devJamie Gennis2013-04-112-11/+11
|\ \ \
| * | | Trace: unhide app tracing APIsJamie Gennis2013-04-102-11/+11
| | | | | | | | | | | | | | | | Change-Id: I48316623fe0394d3fe77e9abca3f6dbf791d0c08
* | | | Merge "add api level 18 to javadoc 'since' tags" into jb-mr2-devScott Main2013-04-111-0/+1
|\ \ \ \
| * | | | add api level 18 to javadoc 'since' tagsScott Main2013-04-111-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Iea2e13ef2fad47d6a19d380b5655aeeda0414930
* | | | | am 6ca3484c: am 430e0c77: am f24a3798: am d17356b0: am f2f5b6ef: delete ↵Scott Main2013-04-119-1418/+0
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | orphaned/redirected files * commit '6ca3484c3fb8ffd78bc67e2ded7687b11ec76b5e': delete orphaned/redirected files
| * | | | am 430e0c77: am f24a3798: am d17356b0: am f2f5b6ef: delete ↵Scott Main2013-04-119-1418/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | orphaned/redirected files * commit '430e0c77aae517bfe45700a81251864723719827': delete orphaned/redirected files
| | * \ \ \ am f24a3798: am d17356b0: am f2f5b6ef: delete orphaned/redirected filesScott Main2013-04-119-1418/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f24a3798781719e99ce45373942f4199e748d59d': delete orphaned/redirected files
| | | * \ \ \ am d17356b0: am f2f5b6ef: delete orphaned/redirected filesScott Main2013-04-119-1418/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd17356b0e23cf79eb1e0dd2f2fadbe4a7f56e886': delete orphaned/redirected files
| | | | * \ \ \ am f2f5b6ef: delete orphaned/redirected filesScott Main2013-04-119-1418/+0
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2f5b6ef987e30919907cf5417fb2b7cac9e2256': delete orphaned/redirected files
| | | | | * | | | delete orphaned/redirected filesScott Main2013-04-109-1418/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6539076edf8962fd974d790a0edd1d4badc4d5f7
* | | | | | | | | Merge "Sensor values changes." into jb-mr2-devJaikumar Ganesh2013-04-115-83/+160
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Sensor values changes.Jaikumar Ganesh2013-04-115-83/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Remove Sensor Event Pool. 2. Allocate fixed array values for each Sensor added. - Needed for backward compatibility. 3. Use SDK checks for backward compatibility for rotation vector. b/8165631 Change-Id: I2d2cf10d3460478ed7af8e6188343f4bb033503c
* | | | | | | | | | Merge "Add new sensor types." into jb-mr2-devJaikumar Ganesh2013-04-110-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add new sensor types.Jaikumar Ganesh2013-04-058-224/+555
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Add uncalibrated gyros and magnetic field sensor. 2. Change max number of events from 3 to 16. 3. Add new APIs for trigger sensors.
* | | | | | | | | | Add new sensor types.Jaikumar Ganesh2013-04-118-224/+555
| |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Add uncalibrated gyros and magnetic field sensor. 2. Change max number of events from 3 to 16. 3. Add new APIs for trigger sensors. Change-Id: Ifac5c0024c8e5f88b721e5cd97ff26afaaa36717
* | | | | | | | | Merge "Make BluetoothGattServer.close() public" into jb-mr2-devMatthew Xie2013-04-112-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make BluetoothGattServer.close() publicAndre Eisenbach2013-04-102-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This functino is needed for applications to un-register from the Bluetooth stack. bug 8591003 Change-Id: Id05f592245d1d90791d34c3617aadac67bc6502c
* | | | | | | | | | Merge "Clean up USAGE_SHARED and add syncing for USAGE_SHARED." into jb-mr2-devTim Murray2013-04-111-4/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Clean up USAGE_SHARED and add syncing for USAGE_SHARED.Tim Murray2013-04-091-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 8567006 Change-Id: Ie9c01eeccdd3fa0a81893314dfbce7c012d3f7d3
* | | | | | | | | | | am bc80d99b: am 55aa87b2: am bd6b22d8: am 0cdbd5a5: am 1c2dea05: add meta ↵Scott Main2013-04-1025-28/+35
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tags to the rest of the training classes * commit 'bc80d99bd9bbf747b42137a24d63a17f71e276d2': add meta tags to the rest of the training classes
| * | | | | | | | | | am 55aa87b2: am bd6b22d8: am 0cdbd5a5: am 1c2dea05: add meta tags to the ↵Scott Main2013-04-1025-28/+35
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rest of the training classes * commit '55aa87b2b36359441c3acb4222980fda8ba2c980': add meta tags to the rest of the training classes
| | * | | | | | | | | am bd6b22d8: am 0cdbd5a5: am 1c2dea05: add meta tags to the rest of the ↵Scott Main2013-04-1025-28/+35
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | training classes * commit 'bd6b22d8088df8d2c98e4d8f289ce0024164a1ad': add meta tags to the rest of the training classes
| | | * | | | | | | | am 0cdbd5a5: am 1c2dea05: add meta tags to the rest of the training classesScott Main2013-04-1025-28/+35
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0cdbd5a5b2b81cb5138ee62526689c2046b2a149': add meta tags to the rest of the training classes
| | | | * | | | | | | am 1c2dea05: add meta tags to the rest of the training classesScott Main2013-04-1025-28/+35
| | | | |\ \ \ \ \ \ \ | | | | | | |_|_|/ / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1c2dea05492b23aa8f19c93fccedbe390e100297': add meta tags to the rest of the training classes
| | | | | * | | | | | add meta tags to the rest of the training classesScott Main2013-04-1025-28/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4db0acee547b198db754eaf0e78062614ac6f59a
* | | | | | | | | | | Merge "Don't sync from adapters that haven't opted in to restricted ↵Amith Yamasani2013-04-112-4/+36
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accounts" into jb-mr2-dev
| * | | | | | | | | | | Don't sync from adapters that haven't opted in to restricted accountsAmith Yamasani2013-04-102-4/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SyncManager should not allow syncing of data from apps that haven't opted in to viewing restricted accounts in limited users. Override getIsSyncable() to check if the sync adapter has the manifest entry to enable restricted accounts of that account type. Return the default isSyncable state if the adapter has opted in, otherwise return 0 for false. Bug: 8566533 Change-Id: I3777f1e4fdb8debe1724ab083272e2d9bd2e63f2
* | | | | | | | | | | | Fix a security check in getting app restrictionsAmith Yamasani2013-04-101-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I02fbab8765d3f8646d0fe62ee867566d1d14707d
* | | | | | | | | | | | Merge "Show an error dialog when account type is requested on a limited ↵Amith Yamasani2013-04-113-0/+57
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user" into jb-mr2-dev
| * | | | | | | | | | | | Show an error dialog when account type is requested on a limited userAmith Yamasani2013-04-103-0/+57
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This covers the scenario where an app doesn't find an account of the required type and requests the account manager to add one of that type. Bug: 8537648 Change-Id: I4d9c8842c2d90aa668f16034d3db007dc61714b8
* | | | | | | | | | | | Merge "Fix missing clock in keyguard" into jb-mr2-devJim Miller2013-04-112-3/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix missing clock in keyguardJim Miller2013-04-102-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where the clock sometimes doesn't show due to the alpha values not being reset when the widget page order changes due to removing a widget. Fixes bug 8545025. Change-Id: I17c531af4c844647b3262fcf56faa84fff8bafc5
* | | | | | | | | | | | Merge "Implicitly enable system apps when updates installed" into jb-mr2-devChristopher Tate2013-04-101-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Implicitly enable system apps when updates installedChristopher Tate2013-04-091-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If someone explicitly installs an update to a system-bundled package, we infer that this means they actually want to use the new code. Bug 7467302 Change-Id: If2dc6f764bafbb3a5c94cbdd32273c030fd784b9
* | | | | | | | | | | | | Merge "Debug logging improvement." into jb-mr2-devCraig Mautner2013-04-101-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Debug logging improvement.Craig Mautner2013-04-101-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously a change to a surface would be logged with the old value and you had to scroll through the logs to see what the new value was. This change reflects the change to the surface immediately. Change-Id: I2a6566466287922d08f4ce2329c61aa46d692ee1
* | | | | | | | | | | | | | Merge "Fix for bug 8574856 - bad metrics in Roboto Italic" into jb-mr2-devRaph Levien2013-04-101-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix for bug 8574856 - bad metrics in Roboto ItalicRaph Levien2013-04-101-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last update to Roboto Italic has a stray point in delta.alt with a y value of -11299. This causes metrics to give too much vertical space in some cases. This is a "hot patch" fix, with the stray point deleted using TTX. We want to fix the font upstream as well, but this should fix things in the mean time. Change-Id: I08edae96f69753b2d46dfc3fd1cc3b9176dcb5ad
* | | | | | | | | | | | | | | Merge "Make MediaRouter ignore remembered wifi displays when wifi display is ↵Adam Powell2013-04-101-4/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | off" into jb-mr2-dev
| * | | | | | | | | | | | | | | Make MediaRouter ignore remembered wifi displays when wifi display is offAdam Powell2013-04-101-4/+13
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 8417329 Change-Id: Ica9bf1b250be4b72ba32e63d7eb1a6ff0b727961
* | | | | | | | | | | | | | | Merge "Send joystick key repeat messages to correct handler" into jb-mr2-devMichael Wright2013-04-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Send joystick key repeat messages to correct handlerMichael Wright2013-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7f8dbe21c9088553ad2c5efe70585f516ab78141
* | | | | | | | | | | | | | | | Merge "Obfuscate any phone numbers that pass through the event log." into ↵Santos Cordon2013-04-101-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev
| * | | | | | | | | | | | | | | | Obfuscate any phone numbers that pass through the event log.Santos Cordon2013-03-061-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 8203219 Change-Id: I455849cab9b2a8e08889cf44d1799448846c9151
* | | | | | | | | | | | | | | | | GPS Hardware geofencing.Jaikumar Ganesh2013-04-1016-8/+1973
| |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for doing geofencing in hardware. Change-Id: I6d5015190e8d84e1f4beb1010ed977a71c1622d0
* | | | | | | | | | | | | | | | Merge "Permit null adapters in Spinners" into jb-mr2-devAdam Powell2013-04-101-13/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |