summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix broken logic in isValidTargetGeorge Mount2014-09-181-2/+2
| | | | | | Bug 17553253 Change-Id: I9f3f2c80e59128fd5f8d4b1b2a67692c00804f62
* Merge "Add @SystemApi to LocationManager methods used by GmsCore (with ↵David Christie2014-09-171-0/+3
|\ | | | | | | reflection). Bug: 17515515" into lmp-dev
| * Add @SystemApi to LocationManager methods used by GmsCore (with reflection).David Christie2014-09-151-0/+3
| | | | | | | | | | | | Bug: 17515515 Change-Id: I005871c721868bc52a3057839949eb342181b7b8
* | Merge "Handle action mode changes properly for actionbar tabs" into lmp-devYigit Boyar2014-09-173-29/+26
|\ \
| * | Handle action mode changes properly for actionbar tabsYigit Boyar2014-09-163-29/+26
| | | | | | | | | | | | | | | Bug: 17513613 Change-Id: I4ebcadc618558153b72bf577232adc3e616adb6b
* | | Merge "Fix issues with multiple languages and multi-users" into lmp-devSandeep Siddhartha2014-09-175-64/+114
|\ \ \
| * | | Fix issues with multiple languages and multi-usersSandeep Siddhartha2014-09-155-64/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For multi-user the issue was looking into the user ID of the current process instead of the active user. The current process was the system process and the call to UserManager was returning a user handle that wasn't of any use while trying to map sound models to a user. For language, the issue was that we were incorrectly just looking up the model based on the keyphrase id, however we should have also taken the enrolled model's locale into account. Explicitly document that for model management the string representation of locales is a BCP47 language tag. Remove debug logging. Bug: 16798166 Bug: 17462570 Bug: 17463511 Change-Id: Ieffb3e218de63f6e7f40af9705dced481a35b0ad
* | | | Merge "Revert body font size to 14sp, fix ActionBar menu text color" into ↵Alan Viverette2014-09-172-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | lmp-dev
| * | | | Revert body font size to 14sp, fix ActionBar menu text colorAlan Viverette2014-09-172-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 17549070 BUG: 17538527 Change-Id: Id4d412ae3c035c6f76ae10569658a0d97e36a0e8
* | | | | Merge "Fix badge asset alpha issue" into lmp-devztenghui2014-09-171-10/+12
|\ \ \ \ \
| * | | | | Fix badge asset alpha issueztenghui2014-09-171-10/+12
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | b/17544362 Change-Id: Ibf22918ccfebe082a25f28f0d4c1991e700a1fd2
* | | | | Merge "NetworkStats always needs arrays." into lmp-devJeff Sharkey2014-09-172-0/+21
|\ \ \ \ \
| * | | | | NetworkStats always needs arrays.Jeff Sharkey2014-09-172-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internal logic relies on Arrays.copyOf(), so always give ourselves valid arrays, using shared empty objects to save overhead. Bug: 17502649 Change-Id: I5dbb00545bdfe45bbd48144ab505ea08cc92cbcd
* | | | | | Merge "Page content sometimes disappears when scrolling a long doc in print ↵Svetoslav2014-09-175-12/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | preview." into lmp-dev
| * | | | | | Page content sometimes disappears when scrolling a long doc in print preview.Svetoslav2014-09-175-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The operations of the remote renderer have to be performed in order, open, render some pages, close. One of the tasks was executed on the wrong executor resuling in a race and an occassional bad state. Also fixed a NPE if the preview list is flinged and then the user presses back. bug:17537922 Change-Id: I5048078ba2b875a2a8335f3a4324afaa34d014a2
* | | | | | | Merge "Eliminate misleading warning." into lmp-devCraig Mautner2014-09-171-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Eliminate misleading warning.Craig Mautner2014-09-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove token from deferred list of tokens to be removed once token is removed. Leaving it in the list leads to logging messages like "WindowManager: removeAppFromTaskLocked: token=AppWindowToken{... } not found" when an attempt to remove it a second time fails. Discovered in logs from b/17512377. Change-Id: Ic83d81841b9b74ae5c4c433d1086d3bbda8e1d64
* | | | | | | | Merge "Add optimizations to keep TaskPersister queue small." into lmp-devCraig Mautner2014-09-171-8/+51
|\ \ \ \ \ \ \ \
| * | | | | | | | Add optimizations to keep TaskPersister queue small.Craig Mautner2014-09-161-8/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CTS tests cause the TaskPersister queue to fill faster than it can drain. Since it contains screenshots this can consume massive memory. Monkey may also cause the queue to back up. Several optimizations are added to drain the queue when it gets large: - High water mark to recognize when queue gets too deep. Queue is completely drained at this point so that obsolete files can be removed from storage. - Use Thread.yield() to give the TaskPersister write thread some cpu cycles. - Remove images from write queue when TaskRecord is removed from recents. May fix bug 17177273. May fix bug 17381033. Change-Id: If21c03c8f380e5f6816cf4701a40fcfe34ace3f1
* | | | | | | | | Merge "Include code when converting unknown causes to string" into lmp-devSailesh Nepal2014-09-171-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Include code when converting unknown causes to stringSailesh Nepal2014-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17535687 Bug: 17241433 Change-Id: I12f0c3b4334dfcb5ac0cd2439ecab9dc77546680
* | | | | | | | | | am 4243ec2a: am 9efd9f60: am fc95c477: docs: edu changes for launchRobert Ly2014-09-171-64/+65
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4243ec2a84e9e42237e8e5bfd5cfb675f765d84f': docs: edu changes for launch
| * \ \ \ \ \ \ \ \ \ am 9efd9f60: am fc95c477: docs: edu changes for launchRobert Ly2014-09-171-64/+65
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9efd9f607006b3e02cda714901884e1ce22475d3': docs: edu changes for launch
| | * \ \ \ \ \ \ \ \ \ am fc95c477: docs: edu changes for launchRobert Ly2014-09-171-64/+65
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc95c477835f86d99cf8c7ce5c1dd098fa42e69c': docs: edu changes for launch
| | | * | | | | | | | | | docs: edu changes for launchRobert Ly2014-09-171-64/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia9047138bd9972e572b5dd93310339b630a2810d
* | | | | | | | | | | | | am 67267dcf: am 6c6664c9: am a209406f: Merge "Docs: Updated to include new ↵Andrew Solovay2014-09-172-51/+148
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subscriptions functionality." into klp-modular-docs * commit '67267dcf909e080ea3adf902c8a9df115bd1b279': Docs: Updated to include new Subscriptions functionality.
| * | | | | | | | | | | | am 6c6664c9: am a209406f: Merge "Docs: Updated to include new Subscriptions ↵Andrew Solovay2014-09-172-51/+148
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functionality." into klp-modular-docs * commit '6c6664c95d7935398909e798e0aad451a2a83b1b': Docs: Updated to include new Subscriptions functionality.
| | * | | | | | | | | | | am a209406f: Merge "Docs: Updated to include new Subscriptions ↵Andrew Solovay2014-09-172-51/+148
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functionality." into klp-modular-docs * commit 'a209406faa1f2b0f1dd7b6e3c5a468729f1c562f': Docs: Updated to include new Subscriptions functionality.
| | | * | | | | | | | | | Merge "Docs: Updated to include new Subscriptions functionality." into ↵Andrew Solovay2014-09-172-51/+148
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-docs
| | | | * | | | | | | | | | Docs: Updated to include new Subscriptions functionality.Andrew Solovay2014-09-102-51/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes refund/revoke, seasonal subscriptions, etc. Docs are staged to: http://asolovay.mtv:9393/google/play/billing/index.html http://asolovay.mtv:9393/google/play/billing/billing_subscriptions.html Change-Id: Id8ad33025c2ae165d6fc5e050c4f2aef70acc0d0
* | | | | | | | | | | | | | Merge "Handle premultiplication correctly for ColorMatrixColorFilters" into ↵Chris Craik2014-09-172-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev
| * | | | | | | | | | | | | | Handle premultiplication correctly for ColorMatrixColorFiltersChris Craik2014-09-172-1/+5
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:17405627 Previously, the input content to the color matrix computation was left premultiplied. Since the color matrix could reduce the alpha channel, the alpha was re-multiplied, but this was incomplete, and incorrect. Instead, apply the color matrix in unpremultiplied space. Change-Id: I87b8e03d2e228e6ded81f7bbfea952605d7a095c
* | | | | | | | | | | | | | Merge "Add 'adb dpm' subcommand to set profile owner" into lmp-devEsteban Talavera2014-09-172-14/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add 'adb dpm' subcommand to set profile ownerEsteban Talavera2014-09-162-14/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Required for GTS tests. Needed to relax the restriction that only root user can run 'pm create-user' as GTS tests can't get root permissions. Bug: 17312478 Change-Id: I1841286ddf51756c73018c087a5f29afeb5b9f15
* | | | | | | | | | | | | | | Merge "SysUI: Add no-wallpaper recents theme for low GFX devices" into lmp-devChristoph Studer2014-09-173-6/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | SysUI: Add no-wallpaper recents theme for low GFX devicesChristoph Studer2014-09-173-6/+19
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a config flag to control the theme to apply to RecentsActivity. Bug: 17522143 Change-Id: I8d03e84e37b77698243673f6c4e676b2c53e0d07
* | | | | | | | | | | | | | | Merge "Reorder user icon colors so that the first default is teal" into lmp-devAlexandra Gherghina2014-09-171-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Reorder user icon colors so that the first default is tealAlexandra Gherghina2014-09-161-2/+2
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17487264 Change-Id: I562fc32d6e7f4b8263d8c3e433035d97335c8787
* | | | | | | | | | | | | | | Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConferenceYorke Lee2014-09-162-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17512380 Change-Id: Ie26bef643bdec97f64247b5f8099f2676ae6c63e
* | | | | | | | | | | | | | | Merge "Add missing methods to Conference object" into lmp-devYorke Lee2014-09-173-3/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add missing methods to Conference objectYorke Lee2014-09-153-3/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add setAudioState, onPlayDtmf and onStopDtmf to the conference object. This fixes DTMF tones for conference calls. Bug: 17512380 Change-Id: Ice9403d3d750131f077a3ea129b7f67430c68348
* | | | | | | | | | | | | | | | Merge "Remove ability to enable/disable phoneaccounts (1/6)" into lmp-devNancy Chen2014-09-174-111/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Remove ability to enable/disable phoneaccounts (1/6)Nancy Chen2014-09-164-111/+26
| | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabling/disabling of phone accounts was only used for SIP accounts and is no longer necessary for the purpose it was put in. - Remove all references to enabling/disabling phone accounts + Rename getEnabledPhoneAccounts -> getCallCapablePhoneAccounts Bug: 17510811 Change-Id: Id805daae3cc698c75f5e747b6a6107ab0bd3afa0
* | | | | | | | | | | | | | | | Merge "Fix disconnect log printf in ConnectionService." into lmp-devAndrew Lee2014-09-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix disconnect log printf in ConnectionService.Andrew Lee2014-09-161-1/+1
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17534940 Change-Id: I41499701d1f7a3ab0816624d27094c6c86fb5b01
* | | | | | | | | | | | | | | Merge "Adjust volume bar visibility in HDMI-CEC system audio mode" into lmp-devJungshik Jang2014-09-172-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Adjust volume bar visibility in HDMI-CEC system audio modeJungshik Jang2014-09-172-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When HDMI-CEC system audio mode is activated. 1. Hide volume bar when volume button is pressed in TV 2. Show volume bar when TV receives volume notification from Audio Receiver. Otherwise, (system audio mode off) follows normal TV's behavior. Bug: 17347499 Change-Id: I1f5bc14285d60d8626a8fbbef9e1959cae7d193b
* | | | | | | | | | | | | | | | Merge "Remove MHL related code." into lmp-devYuncheol Heo2014-09-171-40/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Remove MHL related code.Yuncheol Heo2014-09-171-40/+0
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17479050 Change-Id: Id4a76ccf7325c78817d1b3c3460e5dc40e23831b
* | | | | | | | | | | | | | | | Merge "Fix a small printf format bug." into lmp-devmike dooley2014-09-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |