summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 104999b9: am d14c4844: Merge "Pass connection configuration when setting ↵Mitchell Wills2015-08-062-13/+38
|\ | | | | | | | | | | | | wifi info" into mnc-dev * commit '104999b957440251610dc31939938ef0c85ab23f': Pass connection configuration when setting wifi info
| * am d14c4844: Merge "Pass connection configuration when setting wifi info" ↵Mitchell Wills2015-08-062-13/+38
| |\ | | | | | | | | | | | | | | | | | | into mnc-dev * commit 'd14c48444a40fa2f964461e2f1317bcc3e256295': Pass connection configuration when setting wifi info
| | * Merge "Pass connection configuration when setting wifi info" into mnc-devMitchell Wills2015-08-062-13/+38
| | |\
| | | * Pass connection configuration when setting wifi infoMitchell Wills2015-08-052-13/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the both the ssid and connection info to be verified when updating wifi info. Bug: 22797622 Change-Id: I82d771a299e17469683516c6b1077cb260981812
* | | | am 89718b2b: am be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 ↵Amit Mahajan2015-08-061-43/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | (VF Greece)." into mnc-dev * commit '89718b2bf8f0449b122bf1c8aba039c6a0575c21': Removing tethering overlay for mcc202-mnc05 (VF Greece).
| * | | am be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 (VF ↵Amit Mahajan2015-08-061-43/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Greece)." into mnc-dev * commit 'be948f5a9f519210c5522060ec9ee3bc77eb077e': Removing tethering overlay for mcc202-mnc05 (VF Greece).
| | * | Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-devAmit Mahajan2015-08-051-43/+0
| | |\ \
| | | * | Removing tethering overlay for mcc202-mnc05 (VF Greece).Amit Mahajan2015-08-051-43/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22942869 Change-Id: I1d80ab3a66f7e1cd8e497b0d4236f80b0a126228
* | | | | am 6fdb85d3: am 120fc2c7: Merge "Disable fingerprint when remotely reset by ↵Jim Miller2015-08-062-1/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | DPM" into mnc-dev * commit '6fdb85d383007e7d68895195d6347840276abeab': Disable fingerprint when remotely reset by DPM
| * | | | am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-devJim Miller2015-08-062-1/+12
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '120fc2c74eb290e06cddf1b52d363338f940c612': Disable fingerprint when remotely reset by DPM
| | * | | Merge "Disable fingerprint when remotely reset by DPM" into mnc-devJim Miller2015-08-052-1/+12
| | |\ \ \
| | | * | | Disable fingerprint when remotely reset by DPMJim Miller2015-08-052-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the device is lost or stolen, it's safer to fall back to strong authentication (pin, pattern or password). This disables fingerprint like we do with trust agents. Fixes bug 21620081 Change-Id: I7bbe54be3721b2f160b783daeb3acbe434705046
* | | | | | am cac65feb: am f0affc6d: Merge "Correctly hide setConnectionService" into ↵Yorke Lee2015-08-063-3/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit 'cac65febb7bf50f0bc03d897ebbafa8347c0de31': Correctly hide setConnectionService
| * | | | | am f0affc6d: Merge "Correctly hide setConnectionService" into mnc-devYorke Lee2015-08-063-3/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'f0affc6d46849e844bec9ddc755ffae0042e443f': Correctly hide setConnectionService
| | * | | | Merge "Correctly hide setConnectionService" into mnc-devYorke Lee2015-08-053-3/+1
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Correctly hide setConnectionServiceYorke Lee2015-08-043-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22957023 Change-Id: Ia3bd74f2fcc9f9dd5c9298f4505c18ee652436be
* | | | | | am c34288be: am 2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-devDeepanshu Gupta2015-08-062-5/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c34288be586028f949686e9a4fe7b84207bf2a6d': Make getInt in BridgeTypedArray accept empty String. Fix layout mirroring.
| * | | | | am 2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-devDeepanshu Gupta2015-08-062-5/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '2c1a22d91607e18c7618e79ab026d3c5c4ce8949': Make getInt in BridgeTypedArray accept empty String. Fix layout mirroring.
| | * | | | Merge changes I85106f37,I7db398aa into mnc-devDeepanshu Gupta2015-08-052-5/+3
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Make getInt in BridgeTypedArray accept empty String. Fix layout mirroring.
| | | * | | | Make getInt in BridgeTypedArray accept empty String.Deepanshu Gupta2015-08-041-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The XML editor already warns about the empty strings in places where an int value is required. There's no need to show another warning for it in the rendering panel. Also, the rendering might have also failed when the empty string is encountered. Try an continue the rendering, because no rendering state is really bad. Change-Id: I85106f37e4462f237e85f0b065b4ce8a4bfabf4d
| | | * | | | Fix layout mirroring.Deepanshu Gupta2015-08-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7db398aa2d11dac1210e84922138f78f0c23bb9b
* | | | | | | am f76806a9: Merge "Add boost to increase the load on newly-forked zygote ↵Tim Murray2015-08-052-0/+35
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | processes." into mnc-dr-dev * commit 'f76806a9c0ddc8dd234ff746a52b74b19e7c2c12': Add boost to increase the load on newly-forked zygote processes.
| * | | | | | Merge "Add boost to increase the load on newly-forked zygote processes." ↵Tim Murray2015-08-052-0/+35
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dr-dev
| | * | | | | | Add boost to increase the load on newly-forked zygote processes.Tim Murray2015-08-052-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes it more likely for app launches to end up on a large core in an HMP environment. bug 21915482 Change-Id: Ieac192a4bc1237dd03b9492fcad3a78de5510a58
* | | | | | | | am 4d1128b2: am 8eaf18b0: Merge "Documenting behavior of returning a ↵Paul Mclean2015-08-051-0/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0-length array for formats, channels, rates queries for analog devices." into mnc-dev * commit '4d1128b2b97ab1b6cc711437a5bb5e4a86de6735': Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices.
| * | | | | | | am 8eaf18b0: Merge "Documenting behavior of returning a 0-length array for ↵Paul Mclean2015-08-051-0/+10
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | formats, channels, rates queries for analog devices." into mnc-dev * commit '8eaf18b0ab77184f16870428258650bd12bb2ea5': Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices.
| | * | | | | | Merge "Documenting behavior of returning a 0-length array for formats, ↵Paul Mclean2015-08-051-0/+10
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | channels, rates queries for analog devices." into mnc-dev
| | | * | | | | Documenting behavior of returning a 0-length array for formats,Paul McLean2015-08-051-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | channels, rates queries for analog devices. Bug: 22729461 Change-Id: I3cb1d586f6264e3627cbb0261a3b2c74ca51cf6b
* | | | | | | | am 7cc0cda1: am 881cd155: Merge "MidiManager: use ConcurrentHashMap" into ↵Phil Burk2015-08-051-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '7cc0cda18e5e5bd235041fa2589999c6d4109127': MidiManager: use ConcurrentHashMap
| * | | | | | | am 881cd155: Merge "MidiManager: use ConcurrentHashMap" into mnc-devPhil Burk2015-08-051-3/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '881cd15519535e493d497fefd857f8fe0236c774': MidiManager: use ConcurrentHashMap
| | * | | | | | Merge "MidiManager: use ConcurrentHashMap" into mnc-devPhil Burk2015-08-051-3/+3
| | |\ \ \ \ \ \
| | | * | | | | | MidiManager: use ConcurrentHashMapPhil Burk2015-08-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that adding and removing device listeners is thread-safe. Bug: 22909752 Change-Id: I1369ab53c865b54e6e5eb8ea3e8d437fdd1d7197 Signed-off-by: Phil Burk <philburk@google.com>
* | | | | | | | | am 072097bd: am 8cc00243: Merge "Keep OverScroller.SplineOverScroller state ↵Vladislav Kaznacheev2015-08-051-4/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consistent." into mnc-dev * commit '072097bd3f2b685b4b21d415c2b70cbca9eb76fd': Keep OverScroller.SplineOverScroller state consistent.
| * | | | | | | | am 8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." ↵Vladislav Kaznacheev2015-08-051-4/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '8cc00243423e22a36c518cd5ece97b45271ae5e8': Keep OverScroller.SplineOverScroller state consistent.
| | * | | | | | | Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-devVladislav Kaznacheev2015-08-051-4/+4
| | |\ \ \ \ \ \ \
| | | * | | | | | | Keep OverScroller.SplineOverScroller state consistent.Vladislav Kaznacheev2015-08-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently update() bails out early if it is called too soon after mStartTime has been set. In this case mCurrentPosition remains holding an obsolete value from a previous animation. This causes some strange behavior (see the referenced bug). This patch makes sure that mCurrentPosition is updated every time that mStart is updated. Bug: 22950559 Change-Id: I07b92f30ebe29856f4e04dc19a4820123713fd7e
* | | | | | | | | | am a512415e: am db221acc: Merge "Reduce log spam for the ease of debugging ↵Yohei Yukawa2015-08-051-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 22857361." into mnc-dev * commit 'a512415e13def82532e89fa763f3c8b5ce8bcc7c': Reduce log spam for the ease of debugging Bug 22857361.
| * | | | | | | | | am db221acc: Merge "Reduce log spam for the ease of debugging Bug 22857361." ↵Yohei Yukawa2015-08-051-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit 'db221acce269245d630e8eb456501c5c6241447b': Reduce log spam for the ease of debugging Bug 22857361.
| | * | | | | | | | Merge "Reduce log spam for the ease of debugging Bug 22857361." into mnc-devYohei Yukawa2015-08-051-1/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Reduce log spam for the ease of debugging Bug 22857361.Yohei Yukawa2015-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now InputMethodManagerService generates the following log Couldn't create dir.: /data/system/inputmethod not only when it fails to create the directory but also when /data/system/inputmethod already exists, which makes it difficult for us to figure out the root cause of boot failure on emulator environments (Bug 22857361). With this CL, IMMS no longer shows the message when the directory already exists. Basically this is no risk change, which changes only the condition to show the logging message. Bug: 22857361 Change-Id: I09aaf501b19845c8309b09b57c23077f1757cd1a
* | | | | | | | | | | am 106e4f4c: am cda6e878: Implement Bluetooth settings factory reset (2/5)Ajay Panicker2015-08-052-0/+20
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '106e4f4ca06003ed2cf57bddb24f46a1142cdc49': Implement Bluetooth settings factory reset (2/5)
| * | | | | | | | | | am cda6e878: Implement Bluetooth settings factory reset (2/5)Ajay Panicker2015-08-052-0/+20
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cda6e878cd1b11e10c0b9b4b903b14e11586a963': Implement Bluetooth settings factory reset (2/5)
| | * | | | | | | | | Implement Bluetooth settings factory reset (2/5)Ajay Panicker2015-08-052-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented the factory reset function to be used to reset all bluetooth settings on device to factory default Bug: 16161518
* | | | | | | | | | | am ffb72473: Merge "Remove EXTRA_CALL_HISTORY_INFO." into mnc-dr-devTyler Gunn2015-08-052-6/+9
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ffb72473c67c13c75421f5df979404407ff01bb4': Remove EXTRA_CALL_HISTORY_INFO.
| * | | | | | | | | | Merge "Remove EXTRA_CALL_HISTORY_INFO." into mnc-dr-devTyler Gunn2015-08-052-6/+9
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Remove EXTRA_CALL_HISTORY_INFO.Tyler Gunn2015-07-312-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove EXTRA_CALL_HISTORY_INFO (replaced by EXTRA_LAST FORWARDED_NUMBER). - Added carrier config key for instant lettering. Bug: 22684864 Change-Id: Ic46fdccf5b665417f15e612a2cc4d7f1fb67ccca
* | | | | | | | | | | | am ef7deb90: am e72377e1: Merge "Fix app ops regressions introduced by the ↵Svetoslav Ganov2015-08-051-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | per UID policy change" into mnc-dev * commit 'ef7deb90ac000b5977208e965e0bd84e247140e9': Fix app ops regressions introduced by the per UID policy change
| * | | | | | | | | | | am e72377e1: Merge "Fix app ops regressions introduced by the per UID policy ↵Svetoslav Ganov2015-08-051-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change" into mnc-dev * commit 'e72377e17a837acbe1e537ac737731f6b869fe1e': Fix app ops regressions introduced by the per UID policy change
| | * | | | | | | | | | Merge "Fix app ops regressions introduced by the per UID policy change" into ↵Svetoslav Ganov2015-08-051-4/+6
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| | | * | | | | | | | | | Fix app ops regressions introduced by the per UID policy changeSvetoslav2015-08-041-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Add a missing statement in the parsing code 2. Notify for all packages on UID ap op policy change bug:22957162 Change-Id: Ic2bd5d07ef52be207e66b63ffe45fd8a456eb5a8
generated by cgit v1.1 at 2025-03-15 05:51:40 +0000