summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add decryption support to MountService.Jason parks2011-01-054-2/+86
| | | | | | | * Implement the decryptStorage() method on the Mount Service. This method makes the calls into vold to decrypt the encrypted volumes and mount them. Change-Id: I4f6e07a111cf0b36611d590debf9f6579c5ac5f7
* Merge "LayoutLib: Misc javadoc fixes."Xavier Ducrohet2011-01-045-15/+15
|\
| * LayoutLib: Misc javadoc fixes.Xavier Ducrohet2011-01-035-15/+15
| | | | | | | | Change-Id: Iabe081c20b361b034c2e66b975b8756c0fdcd3d1
* | am c5caaf5f: am 8f49c025: Merge "Added response flags and DSFID extras for ↵Nick Pelly2011-01-032-0/+20
|\ \ | | | | | | | | | | | | | | | | | | NfcV technology (API part)." into gingerbread * commit 'c5caaf5ff816a664939f305ead1091eb2c02cbf5': Added response flags and DSFID extras for NfcV technology (API part).
| * \ am 8f49c025: Merge "Added response flags and DSFID extras for NfcV ↵Nick Pelly2011-01-032-0/+20
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | technology (API part)." into gingerbread * commit '8f49c025ca5b4ed84290fb9e5e0b7acb1c139b35': Added response flags and DSFID extras for NfcV technology (API part).
| | * \ Merge "Added response flags and DSFID extras for NfcV technology (API ↵Nick Pelly2011-01-032-0/+20
| | |\ \ | | | | | | | | | | | | | | | part)." into gingerbread
| | | * | Added response flags and DSFID extras for NfcV technology (API part).Martijn Coenen2011-01-042-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed a missing assignment in NfcB technology. Change-Id: Ic564a0a17a9638c11fa528056da40f74ed37e9e6
* | | | | am d81c68c3: am a743448a: Merge "Tweak Ndef.getType() API. Rename constants, ↵Nick Pelly2011-01-031-7/+20
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | expand javadoc." into gingerbread * commit 'd81c68c31e916fa201f4cd608261afa4d1f0adb6': Tweak Ndef.getType() API. Rename constants, expand javadoc.
| * | | | am a743448a: Merge "Tweak Ndef.getType() API. Rename constants, expand ↵Nick Pelly2011-01-031-7/+20
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | javadoc." into gingerbread * commit 'a743448a1b34d950b1e6f06e308ce113cbc9abcb': Tweak Ndef.getType() API. Rename constants, expand javadoc.
| | * | | Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into ↵Nick Pelly2011-01-031-7/+20
| | |\ \ \ | | | |/ / | | | | | | | | | | gingerbread
| | | * | Tweak Ndef.getType() API. Rename constants, expand javadoc.Nick Pelly2011-01-041-7/+20
| | | | | | | | | | | | | | | | | | | | Change-Id: I9d2c83411411fea4ef46bb7c30ebdbcd9ee3e7d8
* | | | | am a3e4293c: am 163bd407: Merge "Added getType() to NDEF technology class ↵Nick Pelly2011-01-031-0/+19
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | (API part)." into gingerbread * commit 'a3e4293cdc7d09ac93c95d233e4052ac4435773e': Added getType() to NDEF technology class (API part).
| * | | | am 163bd407: Merge "Added getType() to NDEF technology class (API part)." ↵Nick Pelly2011-01-031-0/+19
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread * commit '163bd407492bbadcdc8f0759191e1b9142d06859': Added getType() to NDEF technology class (API part).
| | * | | Merge "Added getType() to NDEF technology class (API part)." into gingerbreadNick Pelly2011-01-031-0/+19
| | |\ \ \ | | | |/ /
| | | * | Added getType() to NDEF technology class (API part).Martijn Coenen2011-01-041-0/+19
| | | | | | | | | | | | | | | | | | | | Change-Id: Idfa391dd9d4a401e1daa3dc90ca57e4a3d9e0fa3
* | | | | am 30ce5f85: am 8c09ef91: Merge "Removed selectAid() from IsoDep." into ↵Nick Pelly2011-01-031-15/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '30ce5f8567df2132736486bb93a60f49582508ec': Removed selectAid() from IsoDep.
| * | | | am 8c09ef91: Merge "Removed selectAid() from IsoDep." into gingerbreadNick Pelly2011-01-031-15/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '8c09ef91aef0706a012e449ba3d16c03e0d64508': Removed selectAid() from IsoDep.
| | * | | Merge "Removed selectAid() from IsoDep." into gingerbreadNick Pelly2011-01-031-15/+0
| | |\ \ \ | | | |/ /
| | | * | Removed selectAid() from IsoDep.Martijn Coenen2011-01-041-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's a convenience method that can be implemented with transceive(); not really needed for now. Change-Id: Idd855c85b15d97ae679d11d908834be3cb2741d8
* | | | | am 7e4d74f7: am 4b94dee8: Merge "Added transfer/restore convience cmds to MF ↵Nick Pelly2011-01-031-2/+29
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Classic tech." into gingerbread * commit '7e4d74f7b9355e8abd6e2fa30e284c9116a08998': Added transfer/restore convience cmds to MF Classic tech.
| * | | | am 4b94dee8: Merge "Added transfer/restore convience cmds to MF Classic ↵Nick Pelly2011-01-031-2/+29
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | tech." into gingerbread * commit '4b94dee8336a1135e4fc67a5911223bb5aabad99': Added transfer/restore convience cmds to MF Classic tech.
| | * | | Merge "Added transfer/restore convience cmds to MF Classic tech." into ↵Nick Pelly2011-01-031-2/+29
| | |\ \ \ | | | | | | | | | | | | | | | | | | gingerbread
| | | * | | Added transfer/restore convience cmds to MF Classic tech.Martijn Coenen2011-01-041-2/+29
| | | |/ / | | | | | | | | | | | | | | | Change-Id: I675993bc3aae6a741d63be458a0dfea240dd5316
* | | | | Merge "Fix bug 3300456 - Prevent duplicate action bar backgrounds in shared ↵Adam Powell2011-01-031-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | container"
| * | | | | Fix bug 3300456 - Prevent duplicate action bar backgrounds in sharedAdam Powell2011-01-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | container Change-Id: I8edb99739be43c7ee82eb4dc4b82a9be17f92d0c
* | | | | | Merge "Again maybe fix issue #3169193..."Dianne Hackborn2011-01-031-2/+5
|\ \ \ \ \ \
| * | | | | | Again maybe fix issue #3169193...Dianne Hackborn2011-01-031-2/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...com.google.android.youtube: java.lang.NullPointerException at com.google.android.youtube.async.UserAuthorizer$3.onCancel(UserAuthorizer.java:324) Only perform one cancel callback for a particular start of the dialog. Change-Id: Ib448fcae2489a63c9b63affdc518658447e90920
* | | | | | Merge "Fix a layout alignment issue in RingtonePickerActivity."Amith Yamasani2011-01-031-1/+1
|\ \ \ \ \ \
| * | | | | | Fix a layout alignment issue in RingtonePickerActivity.Amith Yamasani2010-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3307324
* | | | | | | Merge "Fixed the NumberPicker to adjust to the closest value while ↵Svetoslav Ganov2011-01-031-2/+13
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | scrolling/flinging"
| * | | | | | Fixed the NumberPicker to adjust to the closest value while scrolling/flingingSvetoslav Ganov2011-01-031-2/+13
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Change-Id: I782603d9a187d0ce9196e3fc90f28e372637584c
* | | | | | am e8522998: am 06fccc32: Merge "Clear request list while timeout." into ↵John Wang2011-01-031-24/+47
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit 'e85229988e6350a684be91c3bbf64232271c5663': Clear request list while timeout.
| * | | | | am 06fccc32: Merge "Clear request list while timeout." into gingerbreadJohn Wang2011-01-031-24/+47
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit '06fccc325123bf4c9ebd04ac9300b504436724fe': Clear request list while timeout.
| | * | | | Merge "Clear request list while timeout." into gingerbreadJohn Wang2011-01-031-24/+47
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Clear request list while timeout.John Wang2010-12-281-24/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wakelock will be kept held if there is outstanding requests in request list. When WAKE_LOCK_TIMEOUT occurs, all requests in mRequestList already waited at least DEFAULT_WAKE_LOCK_TIMEOUT but no response. Those lost requests return GENERIC_FAILURE and request list is cleared. bug:3292426 Change-Id: I369c6ba4d6836d65ef616140e48c7304faf888f0
* | | | | | Rename bcc::BCCscript -> bcc::Script. Ideally, should do:Shih-wei Liao2011-01-031-2/+2
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | include bcc.h instead of forward declaration. Change-Id: I649f62d240ed4e13eb95a8988a9ee202b19e7436
* | | | | Fix flicker issue in IME.Dianne Hackborn2011-01-012-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When IME is being moved as part of a window going away, it could flicker as it immediately moves behind the window. Fix this. Also make the default soft input mode for PopupWindow to be to not change the IME visibility, since it is a rare pop-up window that should cause your IME to close. Change-Id: I0b43e080ad012739e9a3e5842794c778c859ac1a
* | | | | Fix setupDataCall breakage.Lorenzo Colitti2010-12-313-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change I1a1adc61 added a new parameter to setupDataCall, but updated the callers incorrectly (specifying the arguments in the wrong order). Fix the order. Change-Id: I0e762de29ac05d387371a7cfe33a33ad16219221
* | | | | Move MTP Java classes to android.mtp.* package.Mike Lockwood2010-12-3016-95/+98
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib18bcaabf314241a95e517d0b93be5845d988e2c Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | 3316147 TimePicker and DatePicker is editable even after the first ↵Svetoslav Ganov2010-12-292-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setEnabled(false). Change-Id: If800b048973200d249b1f5c62af064392ed98d91
* | | | | Merge "3304011 At times Talkback still works after disabling it."Svetoslav Ganov2010-12-291-4/+6
|\ \ \ \ \
| * | | | | 3304011 At times Talkback still works after disabling it.Svetoslav Ganov2010-12-281-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If99ef28c6285a2d290d46518a07d69d5e22cca5b
* | | | | | Merge "Doc change: Updating toc with final restructuring changes"Robert Ly2010-12-291-10/+9
|\ \ \ \ \ \
| * | | | | | Doc change: Updating toc with final restructuring changesRobert Ly2010-12-291-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I126c33c3e7dac5d83607aea41f18402e39d3a3f4
* | | | | | | Merge "Doc change: Updating title"Robert Ly2010-12-291-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Doc change: Updating titleRobert Ly2010-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib86992881a51f0ffc7ea8d409aa0054278b3e763
* | | | | | | | Merge "Doc change: Updating title to "connecting hardware devices""Robert Ly2010-12-291-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Doc change: Updating title to "connecting hardware devices"Robert Ly2010-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6d317ef4ff0a980c04da4ee860fb40f6f554dd7a
* | | | | | | | | Merge "Doc change: updating title"Robert Ly2010-12-291-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Doc change: updating titleRobert Ly2010-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8f299e6d6abaa3476205f7cb4d49bdac3f79387d
generated by cgit v1.1 at 2025-01-25 14:12:26 +0000