Mårten Kongstad
963664b6b7
Continue idmap generation even if name lookup fails.
...
In resources.arsc files, a resource is represented by a specification
block and one or more value blocks. In rare cases, a resource name
is also given a new resource ID, a specification block and no values
blocks. This commit ensures idmap generation does not fail if such an
entry is encountered.
Change-Id: I32302a0b07a7a320b7eeb31886931be3bb7b7e9a
2011-05-19 16:02:35 +02:00
Jean-Baptiste Queru
14402a1a5a
Merge "support humidity sensor type"
2011-05-18 15:00:11 -07:00
Jean-Baptiste Queru
af859fa9ae
Merge "MOTOYA changed two kinds of Japanese font files."
2011-05-18 09:24:40 -07:00
Jean-Baptiste Queru
d698b563da
Merge "Adapt to latest skia"
2011-05-12 15:09:51 -07:00
Jean-Baptiste Queru
c97843ba1f
Merge "Ninepatch tweaks for better interop"
2011-05-12 14:24:09 -07:00
Jean-Baptiste Queru
fa5f5587ae
Merge "Tweak audio APIs for better forward/backward/sideways compatibility."
2011-05-12 14:19:41 -07:00
Jean-Baptiste Queru
cc5d30e103
Merge "Switch to SkSafeUnref for better portability"
2011-05-12 14:19:26 -07:00
Conley Owens
d701fd1819
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
002083a227
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
088cb8af97
Merge "Add missing clean-up of idmap file descriptors."
2011-05-05 13:22:18 -07:00
Jake Hamby
f068f4f487
Merge "Enable support for SMS national language shift tables." into gingerbread
2011-05-05 13:09:11 -07:00
Mårten Kongstad
3e17850f1c
Add missing clean-up of idmap file descriptors.
...
Change-Id: I9bdc9a4b7962f1a8dce77f4b213c8b9dc26e4b0f
2011-05-05 15:38:14 +02:00
Irfan Sheriff
02683c0f5a
am 1a5b6098: Handle GET_POWER failures
...
* commit '1a5b6098d5002ae07ce3f9bc514400a87c2b64fa':
Handle GET_POWER failures
2011-05-04 21:14:47 -07:00
Dan Morrill
b955b3327e
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
1c4c6b4581
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
Conley Owens
d1820ffeb9
Merge "Removing dead store; it was likely a relict of debuging code."
2011-05-02 09:53:25 -07:00
Conley Owens
2f56d20cb0
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
05e4042a1e
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
400c441832
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
88acc06a54
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
a7c8b48525
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
5133e136c9
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
78240a910d
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
078c9c8851
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
3b6b23e1ca
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
b87efff93d
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
7ccbe8f0c8
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
aee2ca4712
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
ef50b7279b
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
cbd9ca853c
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
ddfe01372c
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
88a1e7da4b
Merge "Adjust mBiggerTouchSlopSquare to the suitable value"
2011-04-29 10:01:23 -07:00
Conley Owens
95c58935ca
Merge "Scolling using arrow keys with padding"
2011-04-29 10:00:26 -07:00
Conley Owens
83aef76602
Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"
2011-04-29 10:00:20 -07:00
Conley Owens
e85e4d4ed2
Merge "Fixed to draw texture when loadTexture() is called at first time"
2011-04-29 10:00:12 -07:00
Conley Owens
f157b20d1f
Merge "Fixing wrong Japanese phone formatter."
2011-04-29 10:00:06 -07:00
Conley Owens
1d78460d93
Merge "Fix memory leak of SkMovie class"
2011-04-29 10:00:00 -07:00
Conley Owens
ae9331ec90
Merge "Implement support for ALT and SHIFT modifiers"
2011-04-29 09:59:55 -07:00
Conley Owens
3f9f649a96
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 > Press search key > Touch list item or press back key > ANR popup is shown"
2011-04-29 09:59:48 -07:00
Conley Owens
5324becece
Merge "modify the device to enable to get the state as slide-open/slide-close."
2011-04-29 09:59:42 -07:00
Conley Owens
615537fc62
Merge "Adding missing breaks in BnSurfaceComposer::onTransact"
2011-04-29 09:59:36 -07:00
Conley Owens
56b79aa816
Merge "Fixed to call computeVisibleRegions() when transparent value changed"
2011-04-29 09:59:30 -07:00
Conley Owens
1f824b15fe
Merge "frameworks/base: acquire lock on am only when needed"
2011-04-29 09:59:22 -07:00
Conley Owens
239c5e0e99
Merge "Adding a sanity test in the while loop in readHistory()"
2011-04-29 09:56:58 -07:00
Conley Owens
816fdf4bb3
Merge "Improved conversion accuracy of exif geotag data"
2011-04-29 09:48:10 -07:00
Conley Owens
c41ff27578
Merge "Fixes broken image link in "Tools -> Traceview" documentation page."
2011-04-29 09:48:04 -07:00
Conley Owens
d8203b0520
am e1787009: Merge "Added null check on return value for getKeyDispatcherState()"
...
* commit 'e17870092941cecf64956819d395ec34111cbe71':
Added null check on return value for getKeyDispatcherState()
2011-04-28 23:52:45 -07:00
Conley Owens
4c244c1913
am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here."
...
* commit '501f7bca83ecc2200a590966e461590d9716df7d':
Eliminating dead logic - bitmap state simply cannot be null here.
2011-04-28 23:52:41 -07:00
Conley Owens
1949d64291
am 11d7ec24: Merge "Removing unnecessary computation."
...
* commit '11d7ec24a55319b68bcc96443372c263a41b7dc5':
Removing unnecessary computation.
2011-04-28 23:52:37 -07:00
Conley Owens
383903d49d
am e41d2aed: Merge "Using robust equality check."
...
* commit 'e41d2aed9c8d990d31af70642ae688dad1d8fb4b':
Using robust equality check.
2011-04-28 23:52:32 -07:00