OSDN Git Service

android-x86/frameworks-base.git
10 years agoam c850102d: am 0da4ad42: Merge "Don\'t register methods when there\'s nothing to...
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.

10 years agoam 0da4ad42: Merge "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.

10 years agoMerge "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."

10 years agoam 00efaea9: am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KE...
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

10 years agoam dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"
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

10 years agoMerge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"
Chris Craik [Thu, 20 Mar 2014 02:19:53 +0000 (02:19 +0000)]
Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"

10 years agoam dd6b7495: am 83725810: Merge "Get rid of noise during boot."
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.

10 years agoam 83725810: Merge "Get rid of noise during boot."
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.

10 years agoMerge "Get rid of noise during boot."
Nick Kralevich [Thu, 20 Mar 2014 01:37:38 +0000 (01:37 +0000)]
Merge "Get rid of noise during boot."

10 years agoGet 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

10 years agoam 0dccb02b: am 19fc55e1: Merge "build app_process64 on 64-bit targets"
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

10 years agoam 19fc55e1: Merge "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

10 years agoMerge "build app_process64 on 64-bit targets"
Colin Cross [Thu, 20 Mar 2014 01:14:43 +0000 (01:14 +0000)]
Merge "build app_process64 on 64-bit targets"

10 years agobuild app_process64 on 64-bit targets
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

10 years agoam 924927d3: am 1888333d: am d4375b47: Merge "Fix loop limits." into klp-dev
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.

10 years agoam 1888333d: am d4375b47: Merge "Fix loop limits." into klp-dev
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.

10 years agoam d4375b47: Merge "Fix loop limits." into klp-dev
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.

10 years agoMerge "Fix loop limits." into klp-dev
Craig Mautner [Wed, 19 Mar 2014 21:37:07 +0000 (21:37 +0000)]
Merge "Fix loop limits." into klp-dev

10 years agoam a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."
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.

10 years agoam 240d5638: am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript"
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

10 years agoFix loop limits.
Craig Mautner [Thu, 19 Dec 2013 00:43:51 +0000 (16:43 -0800)]
Fix loop limits.

Fixes bug 12207606.

Change-Id: I9b450d2bc2a72a1f6581147f8930188f34c85299

10 years agoam bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."
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.

10 years agoam c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript"
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

10 years agoMerge "mediaeditor shouldn't depend on audioflinger."
Glenn Kasten [Wed, 19 Mar 2014 21:02:38 +0000 (21:02 +0000)]
Merge "mediaeditor shouldn't depend on audioflinger."

10 years agoMerge "Fix 64 bit compile failures in renderscript"
Glenn Kasten [Wed, 19 Mar 2014 21:01:57 +0000 (21:01 +0000)]
Merge "Fix 64 bit compile failures in renderscript"

10 years agoam e128ca43: am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue...
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

10 years agoam 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in MediaTimeProv...
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

10 years agoam f7b33e86: Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into...
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

10 years agoMerge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev
Lajos Molnar [Wed, 19 Mar 2014 20:43:22 +0000 (20:43 +0000)]
Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev

10 years agoam 5b137544: am 0dca4fc9: am 55b523cc: Merge "[DO NOT MERGE] Fix wallpaper cropping...
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

10 years agoam 55d9907d: am cc8fbb59: am 8acbe888: Merge "[DO NOT MERGE] Centering the crop by...
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

10 years agoam e75d340a: am 5c8e1a6e: Merge "Allow PMS to restorecon directories under /data."
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.

10 years agoam 0dca4fc9: am 55b523cc: Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into...
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

10 years agoam cc8fbb59: am 8acbe888: Merge "[DO NOT MERGE] Centering the crop by default in...
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

10 years agoam 5c8e1a6e: Merge "Allow PMS to restorecon directories under /data."
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.

10 years agoam 55b523cc: Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev
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

10 years agoam 8acbe888: Merge "[DO NOT MERGE] Centering the crop by default in system wallpaper...
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

10 years agoMerge "Allow PMS to restorecon directories under /data."
Nick Kralevich [Wed, 19 Mar 2014 20:17:40 +0000 (20:17 +0000)]
Merge "Allow PMS to restorecon directories under /data."

10 years agoam 96abebd0: am 80af5316: am f260ed09: Merge "Fix inverted conditional in View.setFil...
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.

10 years agoMerge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev
Adam Cohen [Wed, 19 Mar 2014 20:16:10 +0000 (20:16 +0000)]
Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev

10 years agoMerge "[DO NOT MERGE] Centering the crop by default in system wallpaper cropper"...
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

10 years agoam 80af5316: am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhe...
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.

10 years agoam f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured...
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.

10 years agoMerge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev
Jeff Brown [Wed, 19 Mar 2014 20:01:42 +0000 (20:01 +0000)]
Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev

10 years agoam 9a09a523: am 0b472ae1: Merge "androidfw: resolve 64-bit build issues"
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

10 years agoam 48988921: am d6408735: Merge "PacProcessor should be 32 bit only."
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.

10 years agoam 0b472ae1: Merge "androidfw: resolve 64-bit build issues"
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

10 years agoam d6408735: Merge "PacProcessor should be 32 bit only."
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.

10 years agoMerge "androidfw: resolve 64-bit build issues"
Mark Salyzyn [Wed, 19 Mar 2014 19:36:51 +0000 (19:36 +0000)]
Merge "androidfw: resolve 64-bit build issues"

10 years agoMerge "PacProcessor should be 32 bit only."
Glenn Kasten [Wed, 19 Mar 2014 19:34:07 +0000 (19:34 +0000)]
Merge "PacProcessor should be 32 bit only."

10 years agoam 42b746e4: am bd84f01c: am 5d3d4ee3: Merge "Handle provisioning APN by turning...
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.

10 years agoam bd84f01c: am 5d3d4ee3: Merge "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.

10 years agoam 48b3f56c: Merge commit \'95a7829c\' into manualmerge
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.

10 years agoMediaPlayer: fix int overflow issue in MediaTimeProvider
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

10 years agoandroidfw: resolve 64-bit build issues
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

10 years ago[DO NOT MERGE] Centering the crop by default in system wallpaper cropper
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)

10 years ago[DO NOT MERGE] Fix wallpaper cropping bugs
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

10 years agomediaeditor shouldn't depend on audioflinger.
Narayan Kamath [Wed, 19 Mar 2014 11:41:32 +0000 (11:41 +0000)]
mediaeditor shouldn't depend on audioflinger.

Change-Id: I7e1b999b03a3ee5eff2e10a460f64abeba16ba90

10 years agoAllow PMS to restorecon directories under /data.
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>
10 years agoFix 64 bit compile failures in renderscript
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

10 years agoam 5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev
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.

10 years agoMerge "Handle provisioning APN by turning off/on data." into klp-dev
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

10 years agoMerge commit '95a7829c' into manualmerge
Dan Sandler [Wed, 19 Mar 2014 16:02:51 +0000 (12:02 -0400)]
Merge commit '95a7829c' into manualmerge

10 years agoDon't register methods when there's nothing to register.
Narayan Kamath [Wed, 19 Mar 2014 14:13:27 +0000 (14:13 +0000)]
Don't register methods when there's nothing to register.

Change-Id: I6d0233f79bb90089426d702b4076ec5750e82475

10 years agoam b78dc69c: Merge "DO NOT MERGE: Maintain binding to crashed listeners." into klp-dev
Dan Sandler [Wed, 19 Mar 2014 13:08:53 +0000 (13:08 +0000)]
am b78dc69c: Merge "DO NOT MERGE: Maintain binding to crashed listeners." into klp-dev

* commit 'b78dc69c2be43852dcd7150db2b545f9b4110232':
  DO NOT MERGE: Maintain binding to crashed listeners.

10 years agoMerge "DO NOT MERGE: Maintain binding to crashed listeners." into klp-dev
Dan Sandler [Wed, 19 Mar 2014 13:04:00 +0000 (13:04 +0000)]
Merge "DO NOT MERGE: Maintain binding to crashed listeners." into klp-dev

10 years agoPacProcessor should be 32 bit only.
Narayan Kamath [Wed, 19 Mar 2014 11:39:43 +0000 (11:39 +0000)]
PacProcessor should be 32 bit only.

It depends on external/v8, which isn't ready for 64 bit yet.

Change-Id: Ibc9705665b81d3667826dedd6217f2eb6d451c81

10 years agoam c76bccd6: am 17e7c407: am 98a027a5: Merge "Harden NsdManager against null-derefere...
Dave Platt [Wed, 19 Mar 2014 01:07:46 +0000 (01:07 +0000)]
am c76bccd6: am 17e7c407: am 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev

* commit 'c76bccd6ea993eb6e71baff9f5ed2f9fe67af947':
  Harden NsdManager against null-dereference crashes

10 years agoam 1eac8391: am c9a7eeba: am 4cb1bc28: Merge "Refresh cast icon assets to improve...
Jeff Brown [Wed, 19 Mar 2014 01:00:06 +0000 (01:00 +0000)]
am 1eac8391: am c9a7eeba: am 4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev

* commit '1eac839165b05d4998ca344a25594b0a1cfae042':
  Refresh cast icon assets to improve visual contrast.

10 years agoam 17e7c407: am 98a027a5: Merge "Harden NsdManager against null-dereference crashes...
Dave Platt [Wed, 19 Mar 2014 00:59:47 +0000 (00:59 +0000)]
am 17e7c407: am 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev

* commit '17e7c4076b8f1617ed397dae570e9d5240cd9c1b':
  Harden NsdManager against null-dereference crashes

10 years agoFix inverted conditional in View.setFilterTouchesWhenObscured.
Jeff Brown [Wed, 19 Mar 2014 00:58:38 +0000 (17:58 -0700)]
Fix inverted conditional in View.setFilterTouchesWhenObscured.

Bug: 13530806
Change-Id: Icdaf909c355f5b22635e1060f2190502916b144f

10 years agoam c9a7eeba: am 4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast...
Jeff Brown [Wed, 19 Mar 2014 00:55:39 +0000 (00:55 +0000)]
am c9a7eeba: am 4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev

* commit 'c9a7eeba15641da5a5bc8499e813e6c2211506ff':
  Refresh cast icon assets to improve visual contrast.

10 years agoam 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev
Dave Platt [Wed, 19 Mar 2014 00:54:54 +0000 (00:54 +0000)]
am 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev

* commit '98a027a506b5acff1a7ab0cc3655399da7d025c7':
  Harden NsdManager against null-dereference crashes

10 years agoMerge "Harden NsdManager against null-dereference crashes" into klp-dev
Dave Platt [Wed, 19 Mar 2014 00:50:29 +0000 (00:50 +0000)]
Merge "Harden NsdManager against null-dereference crashes" into klp-dev

10 years agoam 4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev
Jeff Brown [Wed, 19 Mar 2014 00:25:41 +0000 (00:25 +0000)]
am 4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev

* commit '4cb1bc2877f8562e6d349a6c737a3055ef4eaa29':
  Refresh cast icon assets to improve visual contrast.

10 years agoMerge "Refresh cast icon assets to improve visual contrast." into klp-dev
Jeff Brown [Wed, 19 Mar 2014 00:19:38 +0000 (00:19 +0000)]
Merge "Refresh cast icon assets to improve visual contrast." into klp-dev

10 years agoam 560e7541: am 1b007565: am 9b650702: Merge "Fix state transition verification....
Xia Wang [Tue, 18 Mar 2014 22:34:17 +0000 (22:34 +0000)]
am 560e7541: am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev

* commit '560e75417252b502a41967aa4d819a029361e384':
  Fix state transition verification.

10 years agoam 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev
Xia Wang [Tue, 18 Mar 2014 22:22:37 +0000 (22:22 +0000)]
am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev

* commit '1b007565c73097728496f3dbe811a51c879ba89e':
  Fix state transition verification.

10 years agoam 9b650702: Merge "Fix state transition verification." into klp-dev
Xia Wang [Tue, 18 Mar 2014 22:16:26 +0000 (22:16 +0000)]
am 9b650702: Merge "Fix state transition verification." into klp-dev

* commit '9b650702113f8a17e09940c3802de71a9fc62ff1':
  Fix state transition verification.

10 years agoMerge "Fix state transition verification." into klp-dev
Xia Wang [Tue, 18 Mar 2014 22:10:32 +0000 (22:10 +0000)]
Merge "Fix state transition verification." into klp-dev

10 years agoam 2d70a47b: am a4a1c0d4: am ac275cb3: am 1f3186ee: (-s ours) am 67a92975: am 88da2bf...
Adrian Roos [Tue, 18 Mar 2014 21:51:44 +0000 (21:51 +0000)]
am 2d70a47b: am a4a1c0d4: am ac275cb3: am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

* commit '2d70a47b0e7196a58561195fc47a57085cf29633':
  DO NOT MERGE - Fix keyguard pattern lockout bug

10 years agoam a4a1c0d4: am ac275cb3: am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5...
Adrian Roos [Tue, 18 Mar 2014 21:47:18 +0000 (21:47 +0000)]
am a4a1c0d4: am ac275cb3: am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

* commit 'a4a1c0d4ee66f85376adbd71800e05b88b60c5b7':
  DO NOT MERGE - Fix keyguard pattern lockout bug

10 years agoRefresh cast icon assets to improve visual contrast.
Jeff Brown [Tue, 18 Mar 2014 20:41:31 +0000 (13:41 -0700)]
Refresh cast icon assets to improve visual contrast.

Bug: 13473719
Change-Id: Ia82b2bc487a612f24bbe47f7d6e9182e862bcefa

10 years agoam ac275cb3: am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5a: (-s ours...
Adrian Roos [Tue, 18 Mar 2014 21:07:28 +0000 (21:07 +0000)]
am ac275cb3: am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

* commit 'ac275cb3d8184e83228899280bb8901e30f3a5f2':
  DO NOT MERGE - Fix keyguard pattern lockout bug

10 years agoam 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce...
Adrian Roos [Tue, 18 Mar 2014 21:03:15 +0000 (21:03 +0000)]
am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

* commit '1f3186ee4505997ef3a235f669313236099308f4':
  DO NOT MERGE - Fix keyguard pattern lockout bug

10 years agoam 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f212...
Adrian Roos [Tue, 18 Mar 2014 20:59:28 +0000 (13:59 -0700)]
am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

* commit '67a92975ac638db3d51ea4978cf78ee207fcceb7':
  DO NOT MERGE - Fix keyguard pattern lockout bug

10 years agoam 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f7...
Adrian Roos [Tue, 18 Mar 2014 20:53:17 +0000 (13:53 -0700)]
am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

* commit '88da2bfaacaafebdd2e0fb9542386486b9594871':
  DO NOT MERGE - Fix keyguard pattern lockout bug

10 years agoam cdf00888: add option to shutdown after factory reset
Doug Zongker [Tue, 18 Mar 2014 20:49:12 +0000 (20:49 +0000)]
am cdf00888: add option to shutdown after factory reset

* commit 'cdf008883921c2eb7daf10c82687e9a36461eb16':
  add option to shutdown after factory reset

10 years agoam ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937...
Adrian Roos [Tue, 18 Mar 2014 20:47:58 +0000 (13:47 -0700)]
am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

* commit 'ed529a5a78ade4833a8fd2ddfaf88d68ca260e6b':
  DO NOT MERGE - Fix keyguard pattern lockout bug

10 years agoam 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix...
Adrian Roos [Tue, 18 Mar 2014 20:41:20 +0000 (13:41 -0700)]
am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

* commit '500ec9ce4b7856eca480c4c7dca8df1211614102':
  DO NOT MERGE - Fix keyguard pattern lockout bug

10 years agoam 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard patte...
Adrian Roos [Tue, 18 Mar 2014 20:34:05 +0000 (13:34 -0700)]
am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

* commit '25fb7133901f6a538d5d365f3c0c1c936e76679d':
  DO NOT MERGE - Fix keyguard pattern lockout bug

10 years agoam 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:28:17 +0000 (13:28 -0700)]
am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

* commit '0b2f212204bd71700a4a32b87ac2d4c6a0c56feb':
  DO NOT MERGE - Fix keyguard pattern lockout bug

10 years agoam d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:24:35 +0000 (13:24 -0700)]
am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

* commit 'd3da8f711ec642322e497a493985bed5c43f597b':
  DO NOT MERGE - Fix keyguard pattern lockout bug

10 years agoam ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:17:12 +0000 (13:17 -0700)]
am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

* commit 'ecba937b005b07d72eadfaf93a200e0b14af2980':
  DO NOT MERGE - Fix keyguard pattern lockout bug

10 years agoadd option to shutdown after factory reset
Doug Zongker [Tue, 18 Mar 2014 19:52:04 +0000 (12:52 -0700)]
add option to shutdown after factory reset

Add a new hidden method to recovery system to trigger a factory reset
followed by a shutdown, rather than a reboot back to the regular
system.  Use this flag when the MASTER_CLEAR intent is broadcast with
a boolean extra "shutdown" set to true.

Change-Id: I2ceb25b715d9f0ef492a75b3d287d1e17cec89ef

10 years agoam d1d91eca: am 7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when persistent...
Dianne Hackborn [Tue, 18 Mar 2014 18:36:53 +0000 (18:36 +0000)]
am d1d91eca: am 7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when persistent process is killed"

* commit 'd1d91eca3e78f2074b110a0e3530aeff6deef6fe':
  Insufficient ProcessRecord cleanup when persistent process is killed

10 years agoam 7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when persistent process is...
Dianne Hackborn [Tue, 18 Mar 2014 18:31:34 +0000 (11:31 -0700)]
am 7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when persistent process is killed"

* commit '7cb1dfe690b2d700ce212712287dfd59c2c8e43f':
  Insufficient ProcessRecord cleanup when persistent process is killed

10 years agoMerge "Insufficient ProcessRecord cleanup when persistent process is killed"
Dianne Hackborn [Tue, 18 Mar 2014 18:28:16 +0000 (18:28 +0000)]
Merge "Insufficient ProcessRecord cleanup when persistent process is killed"

10 years agoFix state transition verification.
Xia Wang [Tue, 4 Mar 2014 19:29:18 +0000 (11:29 -0800)]
Fix state transition verification.

When there is connectivity state change, the network states could be broadcasted multiple times.
The state transition should consider that.

Bug: 13277256
Change-Id: I3d400900a0e2454f9d198629f1c062cbb15bdcd8
(cherry picked from commit 71aae0b6fd1bb9204b81c2e9447f3544c29579c4)

10 years agoHandle provisioning APN by turning off/on data.
Wink Saville [Thu, 13 Mar 2014 13:54:59 +0000 (06:54 -0700)]
Handle provisioning APN by turning off/on data.

This is a start and two tests succeed:

Tested expired AT&T SIM and waiting 15min for alarm to fire.
Tested a provisioned Verizon SIM and works normally.

I've NOT tested AT&T where I've properly completed the provisioning.
I've NOT tested T-Mobile SIM either provisioned or not-provisioned.
I've NOT tested provisioning over WiFi.
I've NOT tested that WiFi <-> Mobile works
I've NOT tested voice calls, SMS, MMS
...

The current bug is below, but it is poorly named either it should be
renamed or a new bug created.

Bug: 13190133
Change-Id: I0a09f642614cd27a8655e9dae764b8999ce485b8