summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 72a6aeac: am 91ca64ea: Merge "AAPT: Add pathMotion custom classes to ↵Adam Lesinski2014-12-031-6/+9
|\ | | | | | | | | | | | | Proguard Keep set" into lmp-mr1-dev * commit '72a6aeaca0712d9b72b9f773e2b72bb45ddd3cb8': AAPT: Add pathMotion custom classes to Proguard Keep set
| * am 91ca64ea: Merge "AAPT: Add pathMotion custom classes to Proguard Keep ↵Adam Lesinski2014-12-031-6/+9
| |\ | | | | | | | | | | | | | | | | | | set" into lmp-mr1-dev * commit '91ca64ea291fceb43514b459ba76d13abc80f506': AAPT: Add pathMotion custom classes to Proguard Keep set
| | * Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into ↵Adam Lesinski2014-12-031-6/+9
| | |\ | | | | | | | | | | | | lmp-mr1-dev
| | | * AAPT: Add pathMotion custom classes to Proguard Keep setAdam Lesinski2014-12-021-6/+9
| | | | | | | | | | | | | | | | | | | | Bug:18590044 Change-Id: Ia5dbf55317d2cc89826316e8d10f031b5d340e57
* | | | am bedd1744: am ef44c051: Merge "Work on issue #18572506: AppOps in-memory ↵Dianne Hackborn2014-12-034-31/+241
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | state is invalid after..." into lmp-mr1-dev * commit 'bedd1744b2afa0ede3ab7ac38a0e4a2111ed53bf': Work on issue #18572506: AppOps in-memory state is invalid after...
| * | | am ef44c051: Merge "Work on issue #18572506: AppOps in-memory state is ↵Dianne Hackborn2014-12-034-31/+241
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | invalid after..." into lmp-mr1-dev * commit 'ef44c0514d497a789dca4731da61a2cf49bb3289': Work on issue #18572506: AppOps in-memory state is invalid after...
| | * | Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." ↵Dianne Hackborn2014-12-034-31/+241
| | |\ \ | | | | | | | | | | | | | | | into lmp-mr1-dev
| | | * | Work on issue #18572506: AppOps in-memory state is invalid after...Dianne Hackborn2014-12-034-31/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...uninstalling updates to a system app Things seem to be working fine, however we were not as aggressive at writing out the current state in this case as we probably should be. Also introduce more features to the appops command, which are useful for testing this. Change-Id: I177a9cc0e16e98b76fee0d052d742e06842bb3f9
* | | | | am b67d8ef6: am f235edf2: Merge "Refresh user list a little more eagerly" ↵Adrian Roos2014-12-033-12/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'b67d8ef66540bfb72db44721f353c661d1f88144': Refresh user list a little more eagerly
| * | | | am f235edf2: Merge "Refresh user list a little more eagerly" into lmp-mr1-devAdrian Roos2014-12-033-12/+10
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'f235edf21532c63f149ad8653a76558fba087f3e': Refresh user list a little more eagerly
| | * | | Merge "Refresh user list a little more eagerly" into lmp-mr1-devAdrian Roos2014-12-033-12/+10
| | |\ \ \
| | | * | | Refresh user list a little more eagerlyAdrian Roos2014-12-013-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately, we don't get a signal when user restrictions such as for adding new users change. That means the user switcher UI could get out of sync and showed the add user option when in fact it couldn't add one. Also cleans up an unused method. Bug: 18292723 Change-Id: I56f6f848d967d9d1c11bd6262eacbdb11f90cfe2
* | | | | | am 5303451e: am 4667d247: Merge "Inconsistent media sizes for es-US locale." ↵Svetoslav2014-12-031-0/+33
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '5303451efc8553f83d921185c6aac30a178d632f': Inconsistent media sizes for es-US locale.
| * | | | | am 4667d247: Merge "Inconsistent media sizes for es-US locale." into lmp-mr1-devSvetoslav2014-12-031-0/+33
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '4667d247bbff30d7fe47a4022b91eb03da17be4d': Inconsistent media sizes for es-US locale.
| | * | | | Merge "Inconsistent media sizes for es-US locale." into lmp-mr1-devSvetoslav2014-12-031-0/+33
| | |\ \ \ \
| | | * | | | Inconsistent media sizes for es-US locale.Svetoslav2014-12-021-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pdf_printer_media_sizes array for es-US was missing resulting in using European paper sizes for US locale and as a result no default media size for this locale. This resulted in printing not working for es-US. bug:18536264 Change-Id: Ied552a63d628be38dc5249f3cd6107cbeaa692a8
* | | | | | | am d6b001f1: am 8d72046b: Merge "Don\'t show no sim icon on wifi devices" ↵Jason Monk2014-12-033-2/+39
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'd6b001f154d7c1038edba4e7729b2aeb0124d359': Don't show no sim icon on wifi devices
| * | | | | | am 8d72046b: Merge "Don\'t show no sim icon on wifi devices" into lmp-mr1-devJason Monk2014-12-033-2/+39
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '8d72046b9ba06feadbcf71815a1c6e1017c8da37': Don't show no sim icon on wifi devices
| | * | | | | Merge "Don't show no sim icon on wifi devices" into lmp-mr1-devJason Monk2014-12-033-2/+39
| | |\ \ \ \ \
| | | * | | | | Don't show no sim icon on wifi devicesJason Monk2014-12-023-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18222975 Change-Id: I82143ad23fa6c4dc5ed57d682186e1bb977a6fe1
* | | | | | | | am b0607472: am 195c4388: Fixing bugs in the LLand.Daniel Sandler2014-12-038-47/+120
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b06074723fbed960749bab2b6e6b7e013f012e6a': Fixing bugs in the LLand.
| * | | | | | | am 195c4388: Fixing bugs in the LLand.Daniel Sandler2014-12-038-47/+120
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '195c438883dfcca799aa456dfe52d24c077e40da': Fixing bugs in the LLand.
| | * | | | | | Fixing bugs in the LLand.Daniel Sandler2014-12-038-47/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | less garish hue on the bugdroid : +----:-----------+ | | : | Θ.......... improved pop styles | | : @ | | | O A |....... occasionally there was no gap to fly | 0 O | through, creating an unintentional | @ | | | commentary on the futility of it all +----------------+ : : : : animation could continue : after activity pause, sapping : precious cycles : failure is now more visceral Bug: 17931806 Change-Id: Iea9bd88e340beb3a0ca310db071ec9f6ec719a33
* | | | | | | | am 5f23693b: am 3f6755f5: CEC: Check command type for power status monitor ↵Jinsuk Kim2014-12-031-3/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | action * commit '5f23693b5cad0647a6bd95ba50dc87bb9023e864': CEC: Check command type for power status monitor action
| * | | | | | | am 3f6755f5: CEC: Check command type for power status monitor actionJinsuk Kim2014-12-031-3/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '3f6755f58722bbae532171c384a294e530864ae1': CEC: Check command type for power status monitor action
| | * | | | | | CEC: Check command type for power status monitor actionJinsuk Kim2014-12-031-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The action was not checking the command type before processing. Makes sure the right command is given for the rest of the action flow. Bug: 18592547 Change-Id: Iaf2584501fc70bfc87e00b74f48cb11c6989f283
* | | | | | | | am 418eecb6: am dad92f36: Merge "Don\'t process windows belonging to unshown ↵Craig Mautner2014-12-031-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | users" into lmp-mr1-dev * commit '418eecb6f870e4fc4dbb5715f61afd51827fe8a5': Don't process windows belonging to unshown users
| * | | | | | | am dad92f36: Merge "Don\'t process windows belonging to unshown users" into ↵Craig Mautner2014-12-031-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'dad92f3668c8f153b4be946bed32c338c5fb6317': Don't process windows belonging to unshown users
| | * | | | | | Merge "Don't process windows belonging to unshown users" into lmp-mr1-devCraig Mautner2014-12-031-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Don't process windows belonging to unshown usersCraig Mautner2014-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a test for whether a window will be shown to the current user. Otherwise we wait to process windows that are drawn but will never be shown. Consequently we end up in a layout loop that continues to set pendingLayoutChanges at the point where "wallpaper and commitFinishDrawingLocked true" message is generated. Fixes bug 18510914. Change-Id: Ib067b41b5f26b146ee6bdb16c2f3b07d20aa2c54
* | | | | | | | | am d99cd44f: am dc99c504: Merge "Make StatusBar display all default ↵Lorenzo Colitti2014-12-037-57/+158
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | networks." into lmp-mr1-dev * commit 'd99cd44f317a0e1b188a0033ebe4948f13c32491': Make StatusBar display all default networks.
| * | | | | | | | am dc99c504: Merge "Make StatusBar display all default networks." into ↵Lorenzo Colitti2014-12-037-57/+158
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'dc99c50427ec700fa4b4191b92f0132cf7238c4b': Make StatusBar display all default networks.
| | * | | | | | | Merge "Make StatusBar display all default networks." into lmp-mr1-devLorenzo Colitti2014-12-037-57/+158
| | |\ \ \ \ \ \ \
| | | * | | | | | | Make StatusBar display all default networks.Lorenzo Colitti2014-12-027-57/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The basic principle is: if an app's traffic could possibly go over a network without the app using the multinetwork APIs (hence "by default"), then the status bar should show that network's connectivity. In the normal case, app traffic only goes over the system's default network connection, so that's the only network returned. With a VPN in force, some app traffic may go into the VPN, and thus over whatever underlying networks the VPN specifies, while other app traffic may go over the system default network (e.g.: a split-tunnel VPN, or an app disallowed by the VPN), so the set of networks returned includes the VPN's underlying networks and the system default. Specifically: 1. Add a NETWORK_CAPABILITY_VALIDATED bit to NetworkCapabilities. 2. Add a hidden API to retrieve the NetworkCapabilities of all default networks for a given macro-user. 3. Modify the status bar code that used getActiveNetworkInfo to determine which network was active, and make it consider all validated networks instead. 4. Because the set of active networks depends on which VPN app the user is running, make the status bar re-evaluate the networking situation when the active user changes. Bug: 17460017 Change-Id: Ie4965f35fb5936b088e6060ee06e362c22297ab2
* | | | | | | | | | am 0821a566: am f675cad8: am 6e854ce5: Merge "Add overscan insets to surface ↵Filip Gruszczynski2014-12-031-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frame dimensions in WallpaperService." into lmp-sprout-dev * commit '0821a56668aa0289b137eb510f35aed54784dc3b': Add overscan insets to surface frame dimensions in WallpaperService.
| * | | | | | | | | am f675cad8: am 6e854ce5: Merge "Add overscan insets to surface frame ↵Filip Gruszczynski2014-12-031-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dimensions in WallpaperService." into lmp-sprout-dev * commit 'f675cad8f5f5781a29ccd733570d90bae3fe8d84': Add overscan insets to surface frame dimensions in WallpaperService.
| | * | | | | | | | am 6e854ce5: Merge "Add overscan insets to surface frame dimensions in ↵Filip Gruszczynski2014-12-031-2/+2
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WallpaperService." into lmp-sprout-dev * commit '6e854ce5728086b3bd293cb37bd83ebeef52aca8': Add overscan insets to surface frame dimensions in WallpaperService.
| | | * \ \ \ \ \ \ \ Merge "Add overscan insets to surface frame dimensions in WallpaperService." ↵Filip Gruszczynski2014-12-031-2/+2
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-sprout-dev
| | | | * | | | | | | | Add overscan insets to surface frame dimensions in WallpaperService.Filip Gruszczynski2014-12-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18595832 Change-Id: Ia5a03cc5e059153d76907627ee0811b0851e35ed
* | | | | | | | | | | | am 25a05188: am b0bbaec8: Merge "TIF: call tune() in HardwareSession" into ↵Dongwon Kang2014-12-031-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '25a051880666022163b9a641737f26adc31e5477': TIF: call tune() in HardwareSession
| * | | | | | | | | | | am b0bbaec8: Merge "TIF: call tune() in HardwareSession" into lmp-mr1-devDongwon Kang2014-12-031-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b0bbaec8bec519e85c33b4a25fa138e8017d6424': TIF: call tune() in HardwareSession
| | * | | | | | | | | | Merge "TIF: call tune() in HardwareSession" into lmp-mr1-devDongwon Kang2014-12-031-0/+1
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | TIF: call tune() in HardwareSessionDongwon Kang2014-11-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Background: The underlying passthrough TV input expects tune() command to show video on the screen and call notifyVideoAvailable(). Bug: 18551619 Change-Id: I257db321c09d621e6bd3c0e69bfe0abfca5742a9
* | | | | | | | | | | | | am 8e1b08ac: am b13c12f5: Merge "Call entitlement on clicking tethering tile ↵Sanket Padawe2014-12-032-16/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in quick settings." into lmp-mr1-dev * commit '8e1b08ac261324f85f53ce2991df83ef53dfd2bf': Call entitlement on clicking tethering tile in quick settings.
| * | | | | | | | | | | | am b13c12f5: Merge "Call entitlement on clicking tethering tile in quick ↵Sanket Padawe2014-12-032-16/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings." into lmp-mr1-dev * commit 'b13c12f58db3026ad30849873b3b6fc664f5ce7b': Call entitlement on clicking tethering tile in quick settings.
| | * | | | | | | | | | | Merge "Call entitlement on clicking tethering tile in quick settings." into ↵Sanket Padawe2014-12-032-16/+11
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | * | | | | | | | | | | Call entitlement on clicking tethering tile in quick settings.Sanket Padawe2014-12-012-16/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call a new activity which would handle enabling of tethering on clicking Tethering tile in Quick Settings. Bug: 18368949 Change-Id: I4cc2ba01f6fa1ac005ba1dc27b223b5fc5359d35
* | | | | | | | | | | | | | am e4c82550: (-s ours) am d6e9e61c: Merge "Fix bug in passing of context ↵Jason Sams2014-12-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flags and version." into lmp-mr1-dev * commit 'e4c825507dfcb2559ecf6401d06fa5a7ecc8e721': Fix bug in passing of context flags and version.
| * | | | | | | | | | | | | am d6e9e61c: Merge "Fix bug in passing of context flags and version." into ↵Jason Sams2014-12-031-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'd6e9e61c9d9b7ba88ae7ade0418e17a3ac2ef341': Fix bug in passing of context flags and version.
| | * | | | | | | | | | | | Merge "Fix bug in passing of context flags and version." into lmp-mr1-devJason Sams2014-12-031-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \