summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method ↵Yohei Yukawa2014-03-141-1/+1
|\ | | | | | | | | | | | | calls * commit '51b921d0e33302b3f431dcfa15bd6588408525ea': DO NOT MERGE - Preserve the order of InputMethodManager method calls
| * DO NOT MERGE - Preserve the order of InputMethodManager method callsYohei Yukawa2014-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherrypick of I0f8d33b0c77129f72581bc43e7f4fdc25469b520 This CL allows the Framework class InputMethodManager to behave in a more deterministic way, that is to say, with an I/O barrier. InputMethodManager#setAdditionalInputMethodSubtypes is internally implemented as a RPC to the corresponding counterpart in InputMethodManagerService. The problem here is that this RPC is marked as "oneway". As a consequence, this public API call returns immediately without waiting the additional subtypes are actually added. This behavior is also not documented so far unfortunately. See the following demo code: Final InputMethodManager imm = ...; imm.setAdditionalInputMethodSubtypes(id, subTypes); Final List<InputMethodInfo> ims = imm.getInputMethodList(); Currently, it is not guaranteed that the InputMethodInfo returned from #getInputMethodList reflects the result of the previous call of #setAdditionalInputMethodSubtypes because of its undocumented asynchronous nature. With this CL, InputMethodManager#setAdditionalInputMethodSubtypes behaves as if it has I/O barrier. This change should make it easy for IME developers to use additional subtype mechanism. BUG: 13033954 BUG: 13291370 Change-Id: I0455b176bfb3176c533ba3241881f05092b98abc
* | am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-devCraig Mautner2014-03-141-0/+1
|\ \ | |/ | | | | | | * commit '3217cc6ff2b3139d8854a3f681da6ae1d163ac92': Fix activities appearing behind launcher icons
| * Merge "Fix activities appearing behind launcher icons" into klp-devCraig Mautner2014-03-141-0/+1
| |\
| | * Fix activities appearing behind launcher iconsCraig Mautner2014-03-131-0/+1
| | | | | | | | | | | | | | | | | | cherry picked from d5c91ece7bfea74ee7ab2bc86f3cb3f5c531f866 Change-Id: I76d20398e71c1be4accfaed6b0791674197b4fb0
* | | am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory ↵Mike Lockwood2014-03-131-2/+25
|\ \ \ | |/ / | | | | | | | | | | | | | | | start and USB configured uevents" into klp-dev * commit '381374b3cd66f364fd644c21f2d9128bcde2f58a': UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
| * | Merge "UsbDeviceManager: Fix race condition between accessory start and USB ↵Mike Lockwood2014-03-131-2/+25
| |\ \ | | | | | | | | | | | | configured uevents" into klp-dev
| | * | UsbDeviceManager: Fix race condition between accessory start and USB ↵Mike Lockwood2014-03-101-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | configured uevents Bug: 13393825 Change-Id: Ice0ce47b4bd65e453771d44b17352982335e9ebd
* | | | am 7e566239: Merge "docs: Updated Building your First App tutorial. Bug: ↵Ricardo Cervera2014-03-1310-39/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13429905" into klp-docs * commit '7e566239656c1de32a3bf695cd2ea3a28f1e906b': docs: Updated Building your First App tutorial. Bug: 13429905
| * \ \ \ Merge "docs: Updated Building your First App tutorial. Bug: 13429905" into ↵Ricardo Cervera2014-03-1310-39/+54
| |\ \ \ \ | | | | | | | | | | | | | | | | | | klp-docs
| | * | | | docs: Updated Building your First App tutorial. Bug: 13429905Ricardo Cervera2014-03-1310-39/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Updated default code in activities from ADT -Updated screenshots for ADT wizards when changed -Updated activity_ with fragment_ where required -Other minor changes Stage: http://quixote.mtv:8004/training/basics/firstapp/creating-project.html Patch: Removed border from the new ADT screenshots. Patch: Replaced device screenshots using an Android 4.4 device. Patch: Addressed Katie's comments. Change-Id: Ic0acf714b1b5913f1f82d6eafac53666a721dfe4
* | | | | | am f7267c8b: Merge "Doc change: Update developer video on home page ↵Joe Fernandez2014-03-131-5/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | carousel." into klp-docs * commit 'f7267c8bdc5431d486e8bb34722d492be82e44f3': Doc change: Update developer video on home page carousel.
| * | | | | Merge "Doc change: Update developer video on home page carousel." into klp-docsJoe Fernandez2014-03-131-5/+5
| |\ \ \ \ \
| | * | | | | Doc change: Update developer video on home page carousel.Dirk Dougherty2014-03-121-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic0cc5f38d8f8b161839585b46dbe3b3b1e1f4942
* | | | | | | am 6d9b034c: Fix typo in public logcat page.John Spurlock2014-03-131-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '6d9b034ce169eeaa7e49574f4694ec96651c7f4e': Fix typo in public logcat page.
| * | | | | | Fix typo in public logcat page.John Spurlock2014-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3b2c9ab53c305ecbb93579be474dc85462d3e2e2
* | | | | | | am ef6c9470: Merge "docs: Added step to get JDK to the Android Studio ↵Ricardo Cervera2014-03-131-0/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | install instructions." into klp-docs * commit 'ef6c94700589958789039749248895a2631ebe55': docs: Added step to get JDK to the Android Studio install instructions.
| * | | | | | Merge "docs: Added step to get JDK to the Android Studio install ↵Ricardo Cervera2014-03-131-0/+6
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | instructions." into klp-docs
| | * | | | | docs: Added step to get JDK to the Android Studio install instructions.Ricardo Cervera2014-03-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13353010 Stage: http://quixote.mtv:8002/sdk/installing/studio.html Patch: Addressed Scott's comments. Patch: Addressed Scott's comments. Change-Id: Iabbe0ddbcfab93e1c5fbbcb222c52bb47662850a
* | | | | | | am 07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docsKatie McCormick2014-03-1314-1/+151
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '07c0ad973a2fdd8a35b3627e69f1134673c8b8e0': Doc update: new doc studio layout editor
| * | | | | | Merge "Doc update: new doc studio layout editor" into klp-docsKatie McCormick2014-03-1014-1/+151
| |\ \ \ \ \ \
| | * | | | | | Doc update: new doc studio layout editorKatie McCormick2014-03-0514-1/+151
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | Change-Id: Iaeb99dca97086540e7d10f9de9e2978439ddebd9
* | | | | | | am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docsJohn Spurlock2014-03-131-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'f6228d95eae7b05dd0015b3062e72c89148e65a2': Fix doc typos in AppOpsManager.java
| * | | | | | Merge "Fix doc typos in AppOpsManager.java" into klp-docsJohn Spurlock2014-03-101-2/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fix doc typos in AppOpsManager.javaJohn Spurlock2014-03-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3c930a2afce48c57570681a95595149df5158053
* | | | | | | am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial ↵JP Abgrall2014-03-132-0/+15
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rwnd" into klp-dev * commit '7baa7c804501b9cbcb5de281c5ddfaf03ba08f7a': ConnectivityService: add support to set TCP initial rwnd
| * | | | | | Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-devJP Abgrall2014-03-132-0/+15
| |\ \ \ \ \ \
| | * | | | | | ConnectivityService: add support to set TCP initial rwndJP Abgrall2014-03-122-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The value for the TCP initial receive window comes from, in order, kernel /proc/sys/net/ipv4/tcp_default_init_rwnd init.rc (via properties) net.tcp.default_init_rwnd properties net.tcp.default_init_rwnd gservices Settings.Global.TCP_DEFAULT_INIT_RWND Bug: 12020135 Change-Id: I0e271be19472900fa9f3bab037d53383ec014a9e
* | | | | | | | am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-devChad Brubaker2014-03-134-35/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '8e240af51df5d7b793f4ae54ce6ff4795ee9f6ac': Remove SO_BINDTODEVICE from VPN protect
| * | | | | | | Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-devChad Brubaker2014-03-134-35/+8
| |\ \ \ \ \ \ \
| | * | | | | | | Remove SO_BINDTODEVICE from VPN protectChad Brubaker2014-03-114-35/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SO_BINDTODEVICE is not needed with policy routing. SO_BINDTODEVICE was also used on the default iface which causes problems when the default iface is IPv6 only and the socket tries to connect to a IPv4 address. Bug: 12940882 Change-Id: I5b2bde0ac5459433fc5749f509072a548532f730
* | | | | | | | | am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only ↵Svetoslav2014-03-132-6/+16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | one color mode." into klp-dev * commit '11b7d9fa6685e742f5b3e3235a8e6e4920dbed02': PrintSpooler crash if printer is reported to have only one color mode.
| * | | | | | | | Merge "PrintSpooler crash if printer is reported to have only one color ↵Svetoslav2014-03-132-6/+16
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode." into klp-dev
| | * | | | | | | | PrintSpooler crash if printer is reported to have only one color mode.Svetoslav2014-03-122-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:11993304 Change-Id: I4932cf1b5b9b89f0cbf97011782ede037e7d814c (cherry picked from commit b0d97b87ba5f23ee867f381a4e5916ebb2e5f762)
* | | | | | | | | | am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into ↵Adrian Roos2014-03-131-11/+12
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit 'cd0d8cb2d97ced5e8110a14f5cf4bc2d4fe68440': DO NOT MERGE - Fix keyguard pattern lockout bug
| * | | | | | | | | Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-devAdrian Roos2014-03-131-11/+12
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | DO NOT MERGE - Fix keyguard pattern lockout bugAdrian Roos2014-03-131-11/+12
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 7c11f8b4659c3444d5037b756b6e5f45a2ea61a6) Conflicts: packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java Bug: 13302967 Change-Id: Ifa4c01e630bd3aa8cadfea8dbbbb4686d50eb945
* | | | | | | | | | am 4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-03-130-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4545b1d29b23cbfe11aa7ca6b54f6518a38db278': Import translations. DO NOT MERGE
| * | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-03-135-5/+5
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-03-125-5/+5
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2b0385f74777c70bda7e2962777c1c96767bd222 Auto-generated-cl: translation import
* | | | | | | | | am a796168d: Merge "Fix issue #11965706: Calls using IntentChooser are now ↵Dianne Hackborn2014-03-131-0/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broken in 4.3 and 4.4" into klp-dev * commit 'a796168da0ea139fe7312678f5031cd96c50097c': Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
| * | | | | | | | Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 ↵Dianne Hackborn2014-03-131-0/+13
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and 4.4" into klp-dev
| | * | | | | | | | Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4Dianne Hackborn2014-03-121-0/+13
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The activity manager needs to set launchedFromPackage to be that of the previous package in the case where flow has been redirected through an intermediate activity. Change-Id: I678fc2e7d984991ac715251a784ba7d7ccbf9fca
* | | | | | | | | am 73bd57f7: Merge "Retain display when creating specialized contexts. (DO ↵Jeff Brown2014-03-133-162/+129
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE)" into klp-dev * commit '73bd57f7abdb9eaf9239aa13945990acc6c97cd2': Retain display when creating specialized contexts. (DO NOT MERGE)
| * | | | | | | | Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" ↵Jeff Brown2014-03-133-162/+129
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev
| | * | | | | | | | Retain display when creating specialized contexts. (DO NOT MERGE)Jeff Brown2014-03-113-162/+129
| | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a bug that cause Context.createPackageContext() to discard display information. Likewise also fixes issues where the activity token, override configuration, user handle, and restriction state might be discarded. As part of this change, reworked how Contexts are created to make initialization easier to understand and less error-prone. The init() methods have been removed and most of the state is now stored in final variables. Bug: 12015587 Change-Id: If795851f1cd078bef889b76a52e00d9b3c06ab11
* | | | | | | | | am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit ↵Zhihai Xu2014-03-121-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parameter from AudioManager" into klp-dev * commit '60d7c9957891280dfb131d5d58f32cf6fb82d5a2': DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
| * | | | | | | | Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter ↵Zhihai Xu2014-03-121-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from AudioManager" into klp-dev
| | * | | | | | | | DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from ↵Zhihai Xu2014-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioManager setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager. It cause maximize volume in Bluetooth speaker/device. The volume expected by Bluetooth Avrcp should be from 0 to 15. But the current volume parameter passed to Bluetooth Avrcp is from 0 to 150. It is scaled by 10 times than the correct volume. index = rescaleIndex(index * 10, streamType, streamTypeAlias); Should divide the volume by 10 before pass to Bluetooth Avrcp. bug:12495379 Change-Id: I4160588e92ee384e21a75d63036d8bd6ccb30621
* | | | | | | | | | am 15258ac8: Fix power manager display wake lock bugs. (DO NOT MERGE)Jeff Brown2014-03-123-55/+67
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '15258ac86bb397206ac44c073baf184ffa0e62f2': Fix power manager display wake lock bugs. (DO NOT MERGE)
generated by cgit v1.1 at 2025-02-13 15:30:32 +0000