Kenny Root
2433c443bb
am f2006f31: Merge "Break apart queries to getInstalled* API" into gingerbread
...
* commit 'f2006f3123dcdf598e052051041b49c89710b53e':
Break apart queries to getInstalled* API
2011-05-19 11:04:01 -07:00
Kenny Root
f2006f3123
Merge "Break apart queries to getInstalled* API" into gingerbread
2011-05-19 10:55:00 -07:00
Jean-Baptiste Queru
4b999030ad
am 6c427617: Merge "support humidity sensor type"
...
* commit '6c427617be940be32fdebbd9c78f9223b292c814':
support humidity sensor type
2011-05-18 15:20:29 -07:00
Jean-Baptiste Queru
6c427617be
Merge "support humidity sensor type"
2011-05-18 15:00:11 -07:00
Jean-Baptiste Queru
a38762f340
am 7ae7d31c: Merge "MOTOYA changed two kinds of Japanese font files."
...
* commit '7ae7d31c2fb06a5c53e71c9e77fa75c8f5777391':
MOTOYA changed two kinds of Japanese font files.
2011-05-18 09:46:16 -07:00
Jean-Baptiste Queru
7ae7d31c2f
Merge "MOTOYA changed two kinds of Japanese font files."
2011-05-18 09:24:40 -07:00
Jean-Baptiste Queru
2d7d3f78c9
am f247e545: Merge "Adapt to latest skia"
...
* commit 'f247e545b521584bb778e79710c1e60ab814839e':
Adapt to latest skia
2011-05-12 15:38:18 -07:00
Jean-Baptiste Queru
a84d29cb04
am 6714e677: Merge "Ninepatch tweaks for better interop"
...
* commit '6714e6774063aae7a8a7a80c36c89ec60170cb27':
Ninepatch tweaks for better interop
2011-05-12 15:38:15 -07:00
Jean-Baptiste Queru
20fd3f0d83
am 4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility."
...
* commit '4770c79c340c2fb5b6b58c0a1ccf8aac96138ef6':
Tweak audio APIs for better forward/backward/sideways compatibility.
2011-05-12 15:38:11 -07:00
Jean-Baptiste Queru
e8b669cbd7
am 71d25778: Merge "Switch to SkSafeUnref for better portability"
...
* commit '71d25778c61327bf82d0e81cd78175a9ee74420a':
Switch to SkSafeUnref for better portability
2011-05-12 15:38:07 -07:00
Jean-Baptiste Queru
f247e545b5
Merge "Adapt to latest skia"
2011-05-12 15:09:51 -07:00
Derek Sollenberger
0ceb9501b2
Adapt to latest skia
...
Change-Id: I39247db04ca8b7993b0f5a16fb0324828d04cc3a
2011-05-12 15:05:44 -07:00
Jean-Baptiste Queru
6714e67740
Merge "Ninepatch tweaks for better interop"
2011-05-12 14:24:09 -07:00
Jean-Baptiste Queru
9faa34e603
Ninepatch tweaks for better interop
...
Change-Id: I96781e2b27fcd6dd05d9726829e8e79ff365cbdc
2011-05-12 14:22:43 -07:00
Jean-Baptiste Queru
4770c79c34
Merge "Tweak audio APIs for better forward/backward/sideways compatibility."
2011-05-12 14:19:41 -07:00
Jean-Baptiste Queru
71d25778c6
Merge "Switch to SkSafeUnref for better portability"
2011-05-12 14:19:26 -07:00
Jean-Baptiste Queru
da94c346a5
Tweak audio APIs for better forward/backward/sideways compatibility.
...
Change-Id: I293e99107aed260db68edccad35cdc15ed88c1d3
2011-05-12 09:46:49 -07:00
Jean-Baptiste Queru
c9e22e9aff
Switch to SkSafeUnref for better portability
...
Change-Id: Ia146a4728b5eb92626462effe42521ca73454a7d
2011-05-12 08:22:35 -07:00
Irfan Sheriff
aa1fd70100
am 8dd85f80: Merge "Move Wifi Ap configuration to flat file" into gingerbread
...
* commit '8dd85f80ba9c463f5616b47eceb620fe21203f4f':
Move Wifi Ap configuration to flat file
2011-05-11 09:45:36 -07:00
Irfan Sheriff
8dd85f80ba
Merge "Move Wifi Ap configuration to flat file" into gingerbread
2011-05-11 09:15:48 -07:00
Irfan Sheriff
97b4cf783f
Move Wifi Ap configuration to flat file
...
Secure settings are accessible by applications without
permissions. Move to a system-only accessible file
Bug: 4391796
Change-Id: I5448943d26cccce39dd4f32423c68dad4bbf50ad
2011-05-09 22:46:55 -07:00
Conley Owens
87d86044c0
am bcd029b6: Merge "Add missing clean-up of idmap file descriptors."
...
* commit 'bcd029b6c8dee19d2cefb00f3ff637b4dcd407b3':
Add missing clean-up of idmap file descriptors.
2011-05-05 14:03:15 -07:00
Jake Hamby
18cc814c94
am 4d53cb02: Merge "Enable support for SMS national language shift tables." into gingerbread
...
* commit '4d53cb02168fe35104d7e644dd9b3efd8ca4c91b':
Enable support for SMS national language shift tables.
2011-05-05 13:31:03 -07:00
Conley Owens
bcd029b6c8
Merge "Add missing clean-up of idmap file descriptors."
2011-05-05 13:22:18 -07:00
Jake Hamby
4d53cb0216
Merge "Enable support for SMS national language shift tables." into gingerbread
2011-05-05 13:09:11 -07:00
Mårten Kongstad
2b91c67137
Add missing clean-up of idmap file descriptors.
...
Change-Id: I9bdc9a4b7962f1a8dce77f4b213c8b9dc26e4b0f
2011-05-05 15:38:14 +02:00
Irfan Sheriff
8a14d8b9c0
am 1a5b6098: Handle GET_POWER failures
...
* commit '1a5b6098d5002ae07ce3f9bc514400a87c2b64fa':
Handle GET_POWER failures
2011-05-04 21:14:47 -07:00
Irfan Sheriff
1a5b6098d5
Handle GET_POWER failures
...
Return a failure when GET_POWER returns a non-conforming
format
Bug: 4380317
Change-Id: If1ce73572ae261cd6998e4289e21112c88859437
2011-05-04 14:23:42 -07:00
Dan Morrill
dacce73bcc
am 4ec33c2a: Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread.
...
* commit '4ec33c2aad59b2a745ee891c9b7246b9533d95e0':
Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread.
2011-05-03 14:59:52 -07:00
Conley Owens
eac835e52e
am 9c4ba258: Merge "Removing dead store; it was likely a relict of debuging code."
...
* commit '9c4ba2580e2ef582747cce2960804a2a5e4b776e':
Removing dead store; it was likely a relict of debuging code.
2011-05-03 12:07:19 -07:00
Dan Morrill
4ec33c2aad
Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6
...
(package manager fix) to gingerbread.
Change-Id: Ia5373100e97bfe42d2211c6249996dc7ff4818e0
2011-05-02 17:00:13 -07:00
Conley Owens
9c4ba2580e
Merge "Removing dead store; it was likely a relict of debuging code."
2011-05-02 09:53:25 -07:00
Conley Owens
a3be387375
am eb8171bc: Merge "Adjust mBiggerTouchSlopSquare to the suitable value"
...
* commit 'eb8171bcff9bd980dbdfc99b2d843a5bcc0ae3e5':
Adjust mBiggerTouchSlopSquare to the suitable value
2011-04-29 10:24:34 -07:00
Conley Owens
b737647db8
am 76616b13: Merge "Scolling using arrow keys with padding"
...
* commit '76616b138eb68a77a838a93fdf2f0322e982f706':
Scolling using arrow keys with padding
2011-04-29 10:24:29 -07:00
Conley Owens
19653c6440
am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"
...
* commit '425db473a05e4204301bf46d4ab6f51b12d9c447':
CHAR_SEQUENCE_CREATOR cannot handle null string
2011-04-29 10:24:23 -07:00
Conley Owens
a47c0d29be
am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time"
...
* commit '58e4a5e2094c5003225fc715ee1a53b2461e71b1':
Fixed to draw texture when loadTexture() is called at first time
2011-04-29 10:24:16 -07:00
Conley Owens
520dd927cb
am 9355a24a: Merge "Fixing wrong Japanese phone formatter."
...
* commit '9355a24af2a4985902f1e9ab4233df3fb831ef72':
Fixing wrong Japanese phone formatter.
2011-04-29 10:24:12 -07:00
Conley Owens
718516f3b7
am 9fd8e057: Merge "Fix memory leak of SkMovie class"
...
* commit '9fd8e0579fb3306f61ba1716b1977562ae3626e1':
Fix memory leak of SkMovie class
2011-04-29 10:24:08 -07:00
Conley Owens
fbe9bcf4af
am 8ebf3558: Merge "Implement support for ALT and SHIFT modifiers"
...
* commit '8ebf35589dd2bee84ad93613df21666b8858a10f':
Implement support for ALT and SHIFT modifiers
2011-04-29 10:24:03 -07:00
Conley Owens
1a846ab089
am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal
...
* commit 'b1578d85ce1b3f3c5e2cf0271011c016b93b7e1a':
Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown
2011-04-29 10:23:58 -07:00
Conley Owens
24825d59f1
am 1ecd0a9b: Merge "modify the device to enable to get the state as slide-open/slide-close."
...
* commit '1ecd0a9b28f8d608cac1a1db6c9bd493ace0ca3e':
modify the device to enable to get the state as slide-open/slide-close.
2011-04-29 10:23:53 -07:00
Conley Owens
af99655e51
am 69ef0d55: Merge "Adding missing breaks in BnSurfaceComposer::onTransact"
...
* commit '69ef0d55d7d7cb9b9bcccffff50ea10ac3833aaa':
Adding missing breaks in BnSurfaceComposer::onTransact
2011-04-29 10:23:47 -07:00
Conley Owens
1ba8543723
am 7ae9f08a: Merge "Fixed to call computeVisibleRegions() when transparent value changed"
...
* commit '7ae9f08a179fa3b312b80826cfc3c6dc97b792ec':
Fixed to call computeVisibleRegions() when transparent value changed
2011-04-29 10:23:42 -07:00
Conley Owens
52749c0b11
am 03daee63: Merge "frameworks/base: acquire lock on am only when needed"
...
* commit '03daee6380772b0ab167a7b28e37d7a21ec89c86':
frameworks/base: acquire lock on am only when needed
2011-04-29 10:23:35 -07:00
Conley Owens
e321d06430
am 2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()"
...
* commit '2f463ef18bb235be57b39cbda536bcd2df2d0908':
Adding a sanity test in the while loop in readHistory()
2011-04-29 10:23:28 -07:00
Conley Owens
7bcb2f3915
am c5505f6a: Merge "Improved conversion accuracy of exif geotag data"
...
* commit 'c5505f6a150db8232cc275bedd400f7f5a593530':
Improved conversion accuracy of exif geotag data
2011-04-29 10:20:34 -07:00
Conley Owens
a50913aaf7
am e1b3f15c: Merge "Fixes broken image link in "Tools -> Traceview" documentation page."
...
* commit 'e1b3f15cadc630469cfadea63275ba8d9a1c9052':
Fixes broken image link in "Tools -> Traceview" documentation page.
2011-04-29 10:20:25 -07:00
Conley Owens
eb8171bcff
Merge "Adjust mBiggerTouchSlopSquare to the suitable value"
2011-04-29 10:01:23 -07:00
Conley Owens
76616b138e
Merge "Scolling using arrow keys with padding"
2011-04-29 10:00:26 -07:00
Conley Owens
425db473a0
Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"
2011-04-29 10:00:20 -07:00