OSDN Git Service
Wei Wang [Thu, 20 Mar 2014 16:24:09 +0000 (16:24 +0000)]
am
d10bc171: am
15a18d07: am
da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev
* commit '
d10bc171a5abb8ddecd8a4888fa8833986f8d8ee':
DO NOT MERGE: Add status callback for start/stop advertising.
Jim Miller [Thu, 20 Mar 2014 16:24:03 +0000 (16:24 +0000)]
am
bd33dc01: am
8e69abf8: am
46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
* commit '
bd33dc01f68ae0f4e4861568c02619e38c40af15':
DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
Jim Miller [Thu, 20 Mar 2014 16:24:01 +0000 (16:24 +0000)]
am
e0683de5: am
37050124: am
a413a4ae: Fix the build. DO NOT MERGE
* commit '
e0683de51e56d7a95c88c5c744f45c72a54a95bc':
Fix the build. DO NOT MERGE
Michael Wright [Thu, 20 Mar 2014 16:23:50 +0000 (16:23 +0000)]
am
69e58e44: Merge "Add idc config option for handling key repeats" into klp-modular-dev
* commit '
69e58e446bc2a030ae423d650e60dbfe317331e6':
Add idc config option for handling key repeats
Chris Craik [Thu, 20 Mar 2014 15:47:34 +0000 (15:47 +0000)]
am
29f00c9f: am
7c9bd98a: am
89513ee5: Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev
* commit '
29f00c9f35d8565bb3e6b8a2526cbb237db6446a':
Fix projection offset caching - DO NOT MERGE
Jim Miller [Thu, 20 Mar 2014 15:47:31 +0000 (15:47 +0000)]
am
abde0aaa: am
375ff2c4: am
2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
* commit '
abde0aaa7958976b8f3a66e348d6a5152b0d838e':
Attempt to fix a bug where SIM progress dialog gets stuck.
Victoria Lease [Thu, 20 Mar 2014 15:46:18 +0000 (15:46 +0000)]
Narayan Kamath [Thu, 20 Mar 2014 10:18:51 +0000 (10:18 +0000)]
am
c850102d: am
0da4ad42: Merge "Don\'t register methods when there\'s nothing to register."
* commit '
c850102d5c4b1fad47c221911c7be5567cebe8b1':
Don't register methods when there's nothing to register.
Narayan Kamath [Thu, 20 Mar 2014 10:13:27 +0000 (03:13 -0700)]
am
0da4ad42: Merge "Don\'t register methods when there\'s nothing to register."
* commit '
0da4ad425d52d1aeec16b31b784c456753532dc2':
Don't register methods when there's nothing to register.
Narayan Kamath [Thu, 20 Mar 2014 10:08:37 +0000 (10:08 +0000)]
Merge "Don't register methods when there's nothing to register."
Wei Wang [Thu, 20 Mar 2014 03:36:45 +0000 (03:36 +0000)]
am
15a18d07: am
da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev
* commit '
15a18d07acc57d465e9d67bb28010912bb9ad15f':
DO NOT MERGE: Add status callback for start/stop advertising.
Wei Wang [Thu, 20 Mar 2014 03:32:17 +0000 (03:32 +0000)]
am
da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev
* commit '
da084104eb768f4472b7988b77a4f2b7e3f170d8':
DO NOT MERGE: Add status callback for start/stop advertising.
Wei Wang [Thu, 20 Mar 2014 03:27:46 +0000 (03:27 +0000)]
Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev
Jim Miller [Thu, 20 Mar 2014 02:47:09 +0000 (02:47 +0000)]
am
8e69abf8: am
46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
* commit '
8e69abf8c62452e6e9bcd254a55a2d80c8ef5b3d':
DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
Jim Miller [Thu, 20 Mar 2014 02:47:04 +0000 (02:47 +0000)]
am
37050124: am
a413a4ae: Fix the build. DO NOT MERGE
* commit '
370501243685a39a52b6e389b97711b906d2d4f8':
Fix the build. DO NOT MERGE
Chris Craik [Thu, 20 Mar 2014 02:30:15 +0000 (02:30 +0000)]
am
00efaea9: am
dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"
* commit '
00efaea980c7a9f84f326b22aef740cb5438d282':
Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
Jim Miller [Thu, 20 Mar 2014 02:30:14 +0000 (02:30 +0000)]
am
46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
* commit '
46e631178e3420fee182e7d9d1ddfdbca9355bc1':
DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
Chris Craik [Thu, 20 Mar 2014 02:24:53 +0000 (19:24 -0700)]
am
dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"
* commit '
dac298005ce3c1361e27bb740e4b518765d43d77':
Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
Jim Miller [Tue, 10 Dec 2013 01:38:05 +0000 (17:38 -0800)]
DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
This fixes a bug where an allocated DeathRecipient in WindowManagerService
was holding a reference to keyguard binder interface after a call to
linkToDeath() without a matchin unlinkToDeath().
It was causing the keyguard side of the binder interface to stick around,
which in tern prevented the keyguard side from releasing its references.
The solution is to ensure matching linkToDeath()/unlinkToDeath() calls.
Fixes bug
11982048
Change-Id: I6959816b819ba953512c53675162195cbf1e0653
Chris Craik [Thu, 20 Mar 2014 02:19:53 +0000 (02:19 +0000)]
Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"
Michael Wright [Thu, 20 Mar 2014 01:55:15 +0000 (01:55 +0000)]
Merge "Add idc config option for handling key repeats" into klp-modular-dev
Nick Kralevich [Thu, 20 Mar 2014 01:52:42 +0000 (01:52 +0000)]
am
dd6b7495: am
83725810: Merge "Get rid of noise during boot."
* commit '
dd6b7495577eca7a00aa37bfdca3449cf1443681':
Get rid of noise during boot.
Jim Miller [Thu, 20 Mar 2014 01:49:31 +0000 (01:49 +0000)]
am
a413a4ae: Fix the build. DO NOT MERGE
* commit '
a413a4ae3280be6c45e84e85d7be3379a5cb51e4':
Fix the build. DO NOT MERGE
Nick Kralevich [Thu, 20 Mar 2014 01:47:45 +0000 (18:47 -0700)]
am
83725810: Merge "Get rid of noise during boot."
* commit '
8372581089422364f4f8bc948b9cbdcf5f8c2e91':
Get rid of noise during boot.
Jim Miller [Thu, 20 Mar 2014 01:37:36 +0000 (18:37 -0700)]
Fix the build. DO NOT MERGE
Change-Id: Ic34e351f86cfb8299b666e860c067d905cce6747
Nick Kralevich [Thu, 20 Mar 2014 01:37:38 +0000 (01:37 +0000)]
Merge "Get rid of noise during boot."
Dianne Hackborn [Thu, 20 Mar 2014 00:49:09 +0000 (17:49 -0700)]
Get rid of noise during boot.
This log is not an error, it is a warning, don't spam a stack
crawl when it happens.
Change-Id: I6038e3625cc0c16af9e54887b5e7ec451d9f864d
Colin Cross [Thu, 20 Mar 2014 01:23:28 +0000 (01:23 +0000)]
am
0dccb02b: am
19fc55e1: Merge "build app_process64 on 64-bit targets"
* commit '
0dccb02b9fd714af1db91e4ba3ca0b0da4e563c1':
build app_process64 on 64-bit targets
Colin Cross [Thu, 20 Mar 2014 01:19:25 +0000 (18:19 -0700)]
am
19fc55e1: Merge "build app_process64 on 64-bit targets"
* commit '
19fc55e1e3a51aba4db985d186d1f4ec075d7ca1':
build app_process64 on 64-bit targets
Chris Craik [Thu, 20 Mar 2014 01:14:44 +0000 (01:14 +0000)]
am
7c9bd98a: am
89513ee5: Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev
* commit '
7c9bd98a4bb0aa6954d5f612c197d03f309980f0':
Fix projection offset caching - DO NOT MERGE
Colin Cross [Thu, 20 Mar 2014 01:14:43 +0000 (01:14 +0000)]
Merge "build app_process64 on 64-bit targets"
Jim Miller [Thu, 20 Mar 2014 01:14:40 +0000 (01:14 +0000)]
am
375ff2c4: am
2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
* commit '
375ff2c4a7b42d6dfd333e0ffa351be88fdab034':
Attempt to fix a bug where SIM progress dialog gets stuck.
Chris Craik [Thu, 20 Mar 2014 01:08:45 +0000 (01:08 +0000)]
am
89513ee5: Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev
* commit '
89513ee544cd6373496179758e09954af0ba217d':
Fix projection offset caching - DO NOT MERGE
Jim Miller [Thu, 20 Mar 2014 01:08:43 +0000 (01:08 +0000)]
am
2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
* commit '
2598fbd71a2109ab307d32935a13fa1eab150e8d':
Attempt to fix a bug where SIM progress dialog gets stuck.
Chris Craik [Thu, 20 Mar 2014 01:04:57 +0000 (01:04 +0000)]
Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev
Jim Miller [Thu, 20 Mar 2014 01:04:12 +0000 (01:04 +0000)]
Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
Colin Cross [Thu, 20 Mar 2014 00:47:39 +0000 (17:47 -0700)]
build app_process64 on 64-bit targets
On 64-bit platforms builds two copies of app_process, the 32-bit
app_process and 64-bit app_process64.
Change-Id: I59d739b5df398ad0bd040c954c57640ff7ab3e72
Wei Wang [Wed, 12 Mar 2014 05:22:41 +0000 (22:22 -0700)]
DO NOT MERGE: Add status callback for start/stop advertising.
Cherrypick from master to fix b/
13289050
Change-Id: I231ba51aaa67b1f917e476ef0f2c8f82c762df77
Conflicts:
core/java/android/bluetooth/BluetoothAdapter.java
core/java/android/bluetooth/BluetoothGatt.java
Victoria Lease [Wed, 19 Mar 2014 22:36:38 +0000 (22:36 +0000)]
Victoria Lease [Wed, 19 Mar 2014 22:32:12 +0000 (22:32 +0000)]
Victoria Lease [Wed, 19 Mar 2014 22:27:06 +0000 (22:27 +0000)]
Victoria Lease [Wed, 19 Mar 2014 22:21:09 +0000 (15:21 -0700)]
Victoria Lease [Wed, 19 Mar 2014 22:14:07 +0000 (15:14 -0700)]
Victoria Lease [Wed, 19 Mar 2014 22:08:32 +0000 (15:08 -0700)]
Victoria Lease [Wed, 19 Mar 2014 22:03:28 +0000 (15:03 -0700)]
Victoria Lease [Wed, 19 Mar 2014 21:57:36 +0000 (14:57 -0700)]
Victoria Lease [Wed, 19 Mar 2014 21:51:58 +0000 (14:51 -0700)]
Craig Mautner [Wed, 19 Mar 2014 21:51:51 +0000 (21:51 +0000)]
am
924927d3: am
1888333d: am
d4375b47: Merge "Fix loop limits." into klp-dev
* commit '
924927d322b2aeb13cbd654b10807b9151a0822c':
Fix loop limits.
Victoria Lease [Wed, 19 Mar 2014 21:47:23 +0000 (14:47 -0700)]
am
31912122: am
6eb28103: am
183f97b7: am
1c12f9e7: malloc some advances
* commit '
3191212259b1629cf8174416adf01522b88501ad':
malloc some advances
Craig Mautner [Wed, 19 Mar 2014 21:46:00 +0000 (21:46 +0000)]
am
1888333d: am
d4375b47: Merge "Fix loop limits." into klp-dev
* commit '
1888333d7e814d6681a327cf1f3eda10098e3620':
Fix loop limits.
Craig Mautner [Wed, 19 Mar 2014 21:41:43 +0000 (21:41 +0000)]
am
d4375b47: Merge "Fix loop limits." into klp-dev
* commit '
d4375b4713658c06001e9dba7105804c872fc199':
Fix loop limits.
Victoria Lease [Wed, 19 Mar 2014 21:40:17 +0000 (14:40 -0700)]
am
6eb28103: am
183f97b7: am
1c12f9e7: malloc some advances
* commit '
6eb2810318262ff36014c52384ed3cdea19bd34e':
malloc some advances
Craig Mautner [Wed, 19 Mar 2014 21:37:07 +0000 (21:37 +0000)]
Merge "Fix loop limits." into klp-dev
Victoria Lease [Wed, 19 Mar 2014 21:32:15 +0000 (14:32 -0700)]
am
183f97b7: am
1c12f9e7: malloc some advances
* commit '
183f97b72faf7a0f45ad66e1b3fd9a4343cc7482':
malloc some advances
Victoria Lease [Wed, 19 Mar 2014 21:27:19 +0000 (14:27 -0700)]
am
1c12f9e7: malloc some advances
* commit '
1c12f9e76298c757423155ad812890d27effafe8':
malloc some advances
Glenn Kasten [Wed, 19 Mar 2014 21:10:41 +0000 (21:10 +0000)]
am
a3dc076d: am
bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."
* commit '
a3dc076d2dda77d8891fcd83f6f4056d15bbf2fc':
mediaeditor shouldn't depend on audioflinger.
Glenn Kasten [Wed, 19 Mar 2014 21:10:36 +0000 (21:10 +0000)]
am
240d5638: am
c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript"
* commit '
240d56386377f3bcd554a2cc07e0c3e336103c86':
Fix 64 bit compile failures in renderscript
Craig Mautner [Thu, 19 Dec 2013 00:43:51 +0000 (16:43 -0800)]
Fix loop limits.
Fixes bug
12207606.
Change-Id: I9b450d2bc2a72a1f6581147f8930188f34c85299
Glenn Kasten [Wed, 19 Mar 2014 21:05:23 +0000 (14:05 -0700)]
am
bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."
* commit '
bfc440923ecb8f32448c675095a2096049fe7ebe':
mediaeditor shouldn't depend on audioflinger.
Glenn Kasten [Wed, 19 Mar 2014 21:05:20 +0000 (14:05 -0700)]
am
c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript"
* commit '
c1f3d4c1ba7903d1b72c2341b5284da12b79ee46':
Fix 64 bit compile failures in renderscript
Glenn Kasten [Wed, 19 Mar 2014 21:02:38 +0000 (21:02 +0000)]
Merge "mediaeditor shouldn't depend on audioflinger."
Glenn Kasten [Wed, 19 Mar 2014 21:01:57 +0000 (21:01 +0000)]
Merge "Fix 64 bit compile failures in renderscript"
Lajos Molnar [Wed, 19 Mar 2014 20:57:15 +0000 (20:57 +0000)]
am
e128ca43: am
0dc08486: am
f7b33e86: Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev
* commit '
e128ca437a668e4050f6b81187d5a9c507c5725e':
MediaPlayer: fix int overflow issue in MediaTimeProvider
Lajos Molnar [Wed, 19 Mar 2014 20:52:03 +0000 (20:52 +0000)]
am
0dc08486: am
f7b33e86: Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev
* commit '
0dc084865313a416246915c72b29c13cc3f404d4':
MediaPlayer: fix int overflow issue in MediaTimeProvider
Lajos Molnar [Wed, 19 Mar 2014 20:46:48 +0000 (20:46 +0000)]
am
f7b33e86: Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev
* commit '
f7b33e8656599ed3e0edd834a03a0366b0f655bb':
MediaPlayer: fix int overflow issue in MediaTimeProvider
Lajos Molnar [Wed, 19 Mar 2014 20:43:22 +0000 (20:43 +0000)]
Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev
Adam Cohen [Wed, 19 Mar 2014 20:30:25 +0000 (20:30 +0000)]
am
5b137544: am
0dca4fc9: am
55b523cc: Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev
* commit '
5b1375445afef5ce0cbceaa69fc44667e3e358fb':
[DO NOT MERGE] Fix wallpaper cropping bugs
Adam Cohen [Wed, 19 Mar 2014 20:30:21 +0000 (20:30 +0000)]
am
55d9907d: am
cc8fbb59: am
8acbe888: Merge "[DO NOT MERGE] Centering the crop by default in system wallpaper cropper" into klp-dev
* commit '
55d9907d595d5938dba52298fe82693b1799687b':
[DO NOT MERGE] Centering the crop by default in system wallpaper cropper
Nick Kralevich [Wed, 19 Mar 2014 20:24:32 +0000 (20:24 +0000)]
am
e75d340a: am
5c8e1a6e: Merge "Allow PMS to restorecon directories under /data."
* commit '
e75d340ae5919942d19f57856ae9e3f8bc62e098':
Allow PMS to restorecon directories under /data.
Adam Cohen [Wed, 19 Mar 2014 20:24:02 +0000 (20:24 +0000)]
am
0dca4fc9: am
55b523cc: Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev
* commit '
0dca4fc929638755454cc46a4eb21e86b3fcb0c8':
[DO NOT MERGE] Fix wallpaper cropping bugs
Adam Cohen [Wed, 19 Mar 2014 20:23:59 +0000 (20:23 +0000)]
am
cc8fbb59: am
8acbe888: Merge "[DO NOT MERGE] Centering the crop by default in system wallpaper cropper" into klp-dev
* commit '
cc8fbb5999687e9413a9b0a8576c21116fc558db':
[DO NOT MERGE] Centering the crop by default in system wallpaper cropper
Nick Kralevich [Wed, 19 Mar 2014 20:20:37 +0000 (13:20 -0700)]
am
5c8e1a6e: Merge "Allow PMS to restorecon directories under /data."
* commit '
5c8e1a6ed4b7e12632c7c82b94e1909ae82b0706':
Allow PMS to restorecon directories under /data.
Adam Cohen [Wed, 19 Mar 2014 20:18:41 +0000 (20:18 +0000)]
am
55b523cc: Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev
* commit '
55b523cc3fac7fd008094b690a0fa8c5527d569c':
[DO NOT MERGE] Fix wallpaper cropping bugs
Adam Cohen [Wed, 19 Mar 2014 20:18:37 +0000 (20:18 +0000)]
am
8acbe888: Merge "[DO NOT MERGE] Centering the crop by default in system wallpaper cropper" into klp-dev
* commit '
8acbe8887a753c0d2e86153d00cf426781c19cf2':
[DO NOT MERGE] Centering the crop by default in system wallpaper cropper
Nick Kralevich [Wed, 19 Mar 2014 20:17:40 +0000 (20:17 +0000)]
Merge "Allow PMS to restorecon directories under /data."
Jeff Brown [Wed, 19 Mar 2014 20:16:18 +0000 (20:16 +0000)]
am
96abebd0: am
80af5316: am
f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev
* commit '
96abebd02559137fa320a17c5b7a985d6fc068ba':
Fix inverted conditional in View.setFilterTouchesWhenObscured.
Adam Cohen [Wed, 19 Mar 2014 20:16:10 +0000 (20:16 +0000)]
Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev
Adam Cohen [Wed, 19 Mar 2014 20:15:41 +0000 (20:15 +0000)]
Merge "[DO NOT MERGE] Centering the crop by default in system wallpaper cropper" into klp-dev
Jeff Brown [Wed, 19 Mar 2014 20:11:12 +0000 (20:11 +0000)]
am
80af5316: am
f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev
* commit '
80af53162477385f20956a55305d0c048ef5c1df':
Fix inverted conditional in View.setFilterTouchesWhenObscured.
Chris Craik [Wed, 29 Jan 2014 21:00:33 +0000 (13:00 -0800)]
Fix projection offset caching - DO NOT MERGE
bug:
13214038
Because the caching of projection matrix didn't account for changes in
the offset flag, the flag could be ignored. Now we use both to verify
that the cached matrix can be used.
Change-Id: I193b94eaf0b98f046a6484f0866c3d25048653fd
(cherry picked from commit
d04a6b15f74035fd2068f34225825b55e94521f4)
Jeff Brown [Wed, 19 Mar 2014 20:05:40 +0000 (20:05 +0000)]
am
f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev
* commit '
f260ed09263d60ff941225e31e22d344afd90c0f':
Fix inverted conditional in View.setFilterTouchesWhenObscured.
Jeff Brown [Wed, 19 Mar 2014 20:01:42 +0000 (20:01 +0000)]
Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev
Mark Salyzyn [Wed, 19 Mar 2014 19:47:02 +0000 (19:47 +0000)]
am
9a09a523: am
0b472ae1: Merge "androidfw: resolve 64-bit build issues"
* commit '
9a09a5236529962afbaba9893e5eaf72bd6621b4':
androidfw: resolve 64-bit build issues
Glenn Kasten [Wed, 19 Mar 2014 19:42:43 +0000 (19:42 +0000)]
am
48988921: am
d6408735: Merge "PacProcessor should be 32 bit only."
* commit '
4898892118c00b3de7a9713d38b32c3dcaf00c91':
PacProcessor should be 32 bit only.
Mark Salyzyn [Wed, 19 Mar 2014 19:42:15 +0000 (12:42 -0700)]
am
0b472ae1: Merge "androidfw: resolve 64-bit build issues"
* commit '
0b472ae13d38dd166a1a35782e028ade85bf2975':
androidfw: resolve 64-bit build issues
Glenn Kasten [Wed, 19 Mar 2014 19:38:41 +0000 (12:38 -0700)]
am
d6408735: Merge "PacProcessor should be 32 bit only."
* commit '
d6408735b9b2ca9378886a4b30e3d691c0923817':
PacProcessor should be 32 bit only.
Mark Salyzyn [Wed, 19 Mar 2014 19:36:51 +0000 (19:36 +0000)]
Merge "androidfw: resolve 64-bit build issues"
Glenn Kasten [Wed, 19 Mar 2014 19:34:07 +0000 (19:34 +0000)]
Merge "PacProcessor should be 32 bit only."
Robert Greenwalt [Wed, 19 Mar 2014 19:13:00 +0000 (19:13 +0000)]
am
42b746e4: am
bd84f01c: am
5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev
* commit '
42b746e4d8baa6141598ddaae7148baea2ddf366':
Handle provisioning APN by turning off/on data.
Robert Greenwalt [Wed, 19 Mar 2014 19:08:44 +0000 (19:08 +0000)]
am
bd84f01c: am
5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev
* commit '
bd84f01c6ce122ab58fc7c5b687dc8bfb0fb03e6':
Handle provisioning APN by turning off/on data.
Dan Sandler [Wed, 19 Mar 2014 19:07:41 +0000 (19:07 +0000)]
am
48b3f56c: Merge commit \'
95a7829c\' into manualmerge
* commit '
48b3f56cd8a3597e6ecfc5ad55d20eca182a6852':
DO NOT MERGE: Maintain binding to crashed listeners.
Lajos Molnar [Tue, 11 Mar 2014 00:21:49 +0000 (17:21 -0700)]
MediaPlayer: fix int overflow issue in MediaTimeProvider
Bug:
13394783
Change-Id: I228ded5cf198852fda867d136cd8b1aacd8b6584
Mark Salyzyn [Wed, 19 Mar 2014 18:00:06 +0000 (11:00 -0700)]
androidfw: resolve 64-bit build issues
- uid_t/gid_t cast to unsigned long
- unused argument warnings
- tab and space requirements
Change-Id: Ib446d8165b9082be02edb55e6b71fd1a03ea3431
Michael Jurka [Tue, 14 Jan 2014 13:48:20 +0000 (14:48 +0100)]
[DO NOT MERGE] Centering the crop by default in system wallpaper cropper
Bug:
12034934
Change-Id: Ice1b1140bd6e351dd4e520f555f245d84a645aac
(cherry picked from commit
2ab14daebac46307d2364733481edc3115bbf98c)
Michael Jurka [Mon, 2 Dec 2013 23:05:44 +0000 (15:05 -0800)]
[DO NOT MERGE] Fix wallpaper cropping bugs
- take into account that image decoder might not
respect inSampleSize
- check rounded values so we don't have crop rects
that lie outside a bitmap's dimensions
- correctly set initial scale on bitmaps that are
larger than the screen size
- switch to using asynctask when setting wallpaper
dimensions
(cherry picked from commit
e39c9a953ca11319b747b3aa79f4ccd082b775b7)
Change-Id: I43372f0bff37f139c8bc83f9956a967d0b4a8708
Narayan Kamath [Wed, 19 Mar 2014 11:41:32 +0000 (11:41 +0000)]
mediaeditor shouldn't depend on audioflinger.
Change-Id: I7e1b999b03a3ee5eff2e10a460f64abeba16ba90
Robert Craig [Tue, 4 Mar 2014 16:57:23 +0000 (11:57 -0500)]
Allow PMS to restorecon directories under /data.
This change applies a relabel to both /data/data and
/data/user directories on boot. Not every boot will
apply this relabeling however. The appropriate
seapp_contexts is hashed and compared to
/data/system/seapp_hash to decide if the relabel
should occur.
Change-Id: I05e8b438950ddb908e46c9168ea6ee601e6d674f
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Narayan Kamath [Wed, 19 Mar 2014 10:15:51 +0000 (10:15 +0000)]
Fix 64 bit compile failures in renderscript
Use uintptr_t for pointers (and not uint32_t) and
also don't assume that size_t is 32 bits wide.
Also uses java longs for passing pointers across
JNI boundaries.
Change-Id: Ie52bd8ae967fbddc911eda3a43cc799d53bbce66
Robert Greenwalt [Wed, 19 Mar 2014 16:15:22 +0000 (16:15 +0000)]
am
5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev
* commit '
5d3d4ee3005e910dce780074d3f68d594aa12070':
Handle provisioning APN by turning off/on data.
Robert Greenwalt [Wed, 19 Mar 2014 16:12:01 +0000 (16:12 +0000)]
Merge "Handle provisioning APN by turning off/on data." into klp-dev
OSDN Git Service
