Gloria Wang
afa4049617
Merge "Initial OMA DRM forward lock contribution"
2011-01-13 10:51:13 -08:00
Dan Morrill
90ed94cf71
am 4330b146: Adding ASL2 attribution for VisualOn.
...
* commit '4330b1464d26fa693b61d496092e10ce0419ee3d':
Adding ASL2 attribution for VisualOn.
2011-01-13 10:19:29 -08:00
Dan Morrill
960f8a68a7
Adding ASL2 attribution for VisualOn.
...
Change-Id: I870133fc366507d95741f8aa234776de58ba60a9
2011-01-13 09:24:30 -08:00
Nick Pelly
2cf27e884b
am a29bf14e: Merge "New Intent defined for RF ON/OFF events" into gingerbread
...
* commit 'a29bf14e1d2857debc632ce4304a1c72dded348c':
New Intent defined for RF ON/OFF events
2011-01-12 16:33:48 -08:00
Nick Pelly
2ee9a92f6a
Merge "New Intent defined for RF ON/OFF events" into gingerbread
2011-01-12 16:28:59 -08:00
Brad Fitzpatrick
10e82906f1
am bdb7aee0: Merge "Fix for crash when setting live wallpaper."
...
* commit 'bdb7aee0a4934eb138f7caaf921f6c86f350b4b7':
Fix for crash when setting live wallpaper.
2011-01-12 15:59:44 -08:00
Brad Fitzpatrick
421951a1df
Merge "Fix for crash when setting live wallpaper."
2011-01-12 15:45:05 -08:00
Kenny Root
6ba9878cc0
am e8c04db7: Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
...
* commit 'e8c04db71e347396e9537ead7113ba9f46706e44':
Add the {get,set}PackageObbPaths calls to API
2011-01-12 15:06:51 -08:00
Kenny Root
9c9f15acb5
Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
2011-01-12 15:03:43 -08:00
Jaikumar Ganesh
bb5239e0f8
am c8f42fb6: Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread
...
* commit 'c8f42fb69867f171c04013b1b1a8f7e897ae3685':
DO NOT MERGE: Remove auto connection on ACL connection.
2011-01-12 13:58:17 -08:00
Jaikumar Ganesh
d4960f4492
Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread
2011-01-12 13:56:13 -08:00
Eric Laurent
2ad398bba5
am bec4abaa: Merge "Fix issue 3302649." into gingerbread
...
* commit 'bec4abaa12bf6759f354b54119c5524cf9339e7b':
Fix issue 3302649.
2011-01-12 13:52:42 -08:00
Eric Laurent
9e41414cd5
Merge "Fix issue 3302649." into gingerbread
2011-01-12 13:50:51 -08:00
Justin Ho
65c8b1a5b2
am 7b667a0c: Merge "Updated flightmode assets" into gingerbread
...
* commit '7b667a0c4b017af3c6b9e1f8a6dae56e2c53e07f':
Updated flightmode assets
2011-01-12 13:50:25 -08:00
Justin Ho
a7498c90b9
Merge "Updated flightmode assets" into gingerbread
2011-01-12 13:47:59 -08:00
Kenny Root
37c43e2298
am 6688b6c3: Merge "Allow updated system apps to retain priority" into gingerbread
...
* commit '6688b6c31765242866fc276cea7fa241fc5b5e7b':
Allow updated system apps to retain priority
2011-01-12 11:59:49 -08:00
Kenny Root
c31a45058e
Merge "Allow updated system apps to retain priority" into gingerbread
2011-01-12 11:56:25 -08:00
Andreas Huber
0955e052f9
am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.
...
* commit '7c6153606cc963191362494c8cb5669749e84326':
Fail to parse duration instead of asserting, if the server response cannot be parsed.
2011-01-12 10:35:18 -08:00
Jeff Brown
7bfdb29e53
Filter virtual keys after touches. (DO NOT MERGE)
...
Adds a new virtualKeyQuietTimeMillis configuration resource that sets
the duration for which virtual keys will be dropped after recent touches
on screen. The default value is 0; it is intended to be overridden
per device using a resource overlay.
This change is designed to help in two cases:
1. Swipes from touchscreen into virtual key area.
2. Accidental taps in virtual key area while using on-screen keyboard.
Bug: 3089163
Change-Id: Id6733c83c2e2bc8d9553aa0e5c1fd74b741bec6e
2011-01-11 20:56:04 -08:00
Andreas Huber
ab6f2d6117
am 7e2f9cc8: DO NOT MERGE: Fix Matroska issues
...
* commit '7e2f9cc81da788006790365ff11f06551fc1bc26':
DO NOT MERGE: Fix Matroska issues
2011-01-11 16:22:33 -08:00
repo sync
4bbc09c0e3
resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp
...
Change-Id: Icef97302fb99e3dd346ec6ee04aa9e8eea7bff26
2011-01-11 15:26:51 -08:00
Andreas Huber
e9bef148d2
Merge "DO NOT MERGE: Fix parsing of ntp= PLAY response." into gingerbread
2011-01-11 13:52:12 -08:00
Kenny Root
9dddc98693
am 91c459ec: Copy user info from PackageSetting as well
...
* commit '91c459ec7dba6d56816ff5cbd92c627e0f718915':
Copy user info from PackageSetting as well
2011-01-11 12:27:42 -08:00
Chung-yih Wang
2020ead96a
am 65ba2c42: Merge "Add auth. username in SipProfile." into gingerbread
...
* commit '65ba2c421c19fde04e6b294087a5a9c507964575':
Add auth. username in SipProfile.
2011-01-11 02:15:29 -08:00
Chung-yih Wang
63f338d83d
Merge "Add auth. username in SipProfile." into gingerbread
2011-01-11 02:08:19 -08:00
Nick Pelly
902fb854de
am ca36d863: Update API current.xml to unbreak build.
...
* commit 'ca36d863cc1684807e93f442c5ace89f08b9b5f5':
Update API current.xml to unbreak build.
2011-01-10 14:19:30 -08:00
Martijn Coenen
4f545cef06
am 25be5365: Implement canMakeReadonly().
...
* commit '25be53652167300183282d170a00a6df576523f5':
Implement canMakeReadonly().
2011-01-10 12:14:36 -08:00
James Dong
4fb9fc9e88
am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread
...
* commit '13d1cb56dfdfc89888de6a0389b0fe6cf7e36c27':
Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
2011-01-10 12:09:09 -08:00
Nick Pelly
3407f042e5
am 92939376: Merge "Remove attemptDeadServiceRecovery() from TagTechnology\'s." into gingerbread
...
* commit '92939376199a08fa0a3b01759579a4979c2a94a2':
Remove attemptDeadServiceRecovery() from TagTechnology's.
2011-01-10 12:06:51 -08:00
Nick Pelly
f0732fbd4d
am d64d711d: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread
...
* commit 'd64d711d457326b503981f7e55ab1448fa23ad9f':
Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
2011-01-10 12:06:39 -08:00
James Dong
e59980106f
Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread
2011-01-10 12:04:50 -08:00
Nick Pelly
19fded7391
Merge "Remove attemptDeadServiceRecovery() from TagTechnology's." into gingerbread
2011-01-10 12:02:36 -08:00
Nick Pelly
e7934257bd
Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread
2011-01-10 12:02:26 -08:00
Brad Fitzpatrick
e313fa36aa
am cb842753: Merge "Closing cursor in finalizer to avoid GREF and fd leak in acore"
...
* commit 'cb8427538dfdc5eae941e377b11bfd11a95fc5a5':
Closing cursor in finalizer to avoid GREF and fd leak in acore
2011-01-10 08:32:35 -08:00
Brad Fitzpatrick
5690f917fa
Merge "Closing cursor in finalizer to avoid GREF and fd leak in acore"
2011-01-10 08:02:03 -08:00
Dianne Hackborn
88221926c7
am 9aac2e2b: Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread
...
* commit '9aac2e2b9541c424ca02483631b08949f0e90c8c':
Referencing of "r.record.name" is occured, when "r.record" is null.
2011-01-09 13:56:07 -08:00
Dianne Hackborn
b318ca6d37
Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread
2011-01-09 13:53:53 -08:00
Chris Tate
02b4b6c97b
am bbff7ed4: DO NOT MERGE : Ensure that the first post-restore backup pass is correct
...
* commit 'bbff7ed44b353ff299b900a1ff50812a082206f0':
DO NOT MERGE : Ensure that the first post-restore backup pass is correct
2011-01-09 13:31:23 -08:00
Chris Tate
d975f24dfb
am 6ec91731: DO NOT MERGE : Permission fix: don\'t require BACKUP perm for self-restores
...
* commit '6ec91731cbf6ee1a9a914d341fab9567d1599018':
DO NOT MERGE : Permission fix: don't require BACKUP perm for self-restores
2011-01-09 13:04:01 -08:00
Dianne Hackborn
a1c67eb61f
am 433863b1: Fix issue #3333958 : Package Manager can sometimes mistakenly think...
...
* commit '433863b1085248a8fdc9bcd0ac8501cc6a7b8ace':
Fix issue #3333958 : Package Manager can sometimes mistakenly think...
2011-01-09 11:49:59 -08:00
Dianne Hackborn
c288521de0
am cd23823d: Merge "Fix issue # 3227963: SecurityException: Neither user 10023 nor..." into gingerbread
...
* commit 'cd23823d4f533431c76baa104eb50b7803b3b391':
Fix issue # 3227963: SecurityException: Neither user 10023 nor...
2011-01-09 11:44:17 -08:00
Dianne Hackborn
3948d710ef
Merge "Fix issue # 3227963: SecurityException: Neither user 10023 nor..." into gingerbread
2011-01-09 11:38:15 -08:00
Romain Guy
b08fbaa16f
am fcf3d12d: Merge "Typo in Javadoc"
...
* commit 'fcf3d12d701e41d6e46bae8c13776f56d54f90e8':
Typo in Javadoc
2011-01-08 10:18:10 -08:00
Romain Guy
08b4007d23
Merge "Typo in Javadoc"
2011-01-08 10:04:32 -08:00
Gloria Wang
503e29c1db
am 0544d059: Merge "DRM Framework bug fixes."
...
* commit '0544d05990c0f43a143e98e71f7fc60277872806':
DRM Framework bug fixes.
2011-01-07 15:34:08 -08:00
Scott Main
b521dc0fe7
am 9b447d12: docs: catchup gingerbread to gingerbread-docs with misc changes
...
* commit '9b447d122a2f0a4798f03749e9d93b9a58834fe3':
docs: catchup gingerbread to gingerbread-docs with misc changes
2011-01-07 15:32:04 -08:00
Scott Main
bf1c42089c
am 3d0f0108: cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
...
* commit '3d0f0108f9487512195c7344be2417c30a93c3fc':
cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
2011-01-07 13:36:58 -08:00
Scott Main
2b01f77ccb
am c5602aee: fix bug 3295540
...
* commit 'c5602aeea3f4962dcb66d7a9e4a733259d5c12d5':
fix bug 3295540
2011-01-07 13:34:54 -08:00
Gloria Wang
988b1a4cf1
Merge "DRM Framework bug fixes."
2011-01-07 11:10:49 -08:00
Yu Shan Emily Lau
431a1a8bfe
am 2af4e71d: Merge "Fix the test application orientation. Bug# 3205196" into gingerbread
...
* commit '2af4e71dd47565d794ad48041a156871396a7dde':
Fix the test application orientation. Bug# 3205196
2011-01-07 09:40:18 -08:00