drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
172,668 Commits 1 Branch 0 Tags
Commit Graph

172668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
3968820fc7 am cb8d8e10: Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev 
automerge: 16e4324

* commit '16e4324dd967d180f77fb25dbeea77229eaf0511':
  Fix issue #18827122: system server crashed on broadcasting...
 2015-01-08 21:48:34 +00:00
Dianne Hackborn
16e4324dd9 am cb8d8e10: Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev 
* commit 'cb8d8e10b0c1163914aca85f8e3b73a0cac86fb4':
  Fix issue #18827122: system server crashed on broadcasting...
 2015-01-08 21:46:53 +00:00
Dianne Hackborn
cb8d8e10b0 Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev 2015-01-08 21:41:35 +00:00
Lajos Molnar
a4f8397d91 am 31ef8ef5: Merge "Use NULL instead of 0 when invoking CallStaticVoidMethod" into lmp-mr1-dev 
automerge: 92160ba

* commit '92160ba97dd2e54f6492b621452bbefe53f8285d':
  Use NULL instead of 0 when invoking CallStaticVoidMethod
 2015-01-08 20:28:04 +00:00
Lajos Molnar
92160ba97d am 31ef8ef5: Merge "Use NULL instead of 0 when invoking CallStaticVoidMethod" into lmp-mr1-dev 
* commit '31ef8ef5d0f98aa08b4c8247d1f252379d97a548':
  Use NULL instead of 0 when invoking CallStaticVoidMethod
 2015-01-08 20:24:33 +00:00
Adam Lesinski
6e2eb2df4c am c04a21a0: Merge "Fixup aapt usage message" automerge: 64044d0 
* commit 'c04a21a0ef6cd97a45307e4c1de9088e57719ca2':
  Fixup aapt usage message
 2015-01-08 20:24:33 +00:00
Lajos Molnar
31ef8ef5d0 Merge "Use NULL instead of 0 when invoking CallStaticVoidMethod" into lmp-mr1-dev 2015-01-08 20:19:00 +00:00
Adam Lesinski
c04a21a0ef Merge "Fixup aapt usage message" 
automerge: 64044d0

* commit '64044d0b7bc9aa46c60adcadce699d556e1c608e':
  Fixup aapt usage message
 2015-01-08 20:18:38 +00:00
Adam Lesinski
64044d0b7b Merge "Fixup aapt usage message" 2015-01-08 20:15:39 +00:00
Craig Mautner
0e2fdb4312 Merge "Remove AppWindowTokens from exiting apps with task" into lmp-mr1-dev automerge: 62a32ee 
automerge: 125b725

* commit '125b725f46199b7058e437bb83f5d5179e1be73e':
  Remove AppWindowTokens from exiting apps with task
 2015-01-08 19:20:57 +00:00
Sanket Padawe
b3096a344e Merge "Removing DUN APN for Koodo CA (302-220)" into lmp-mr1-dev automerge: d3b6956 
automerge: 720b3a0

* commit '720b3a04a499d1ed516a37a8eadade9c8fb15f51':
  Removing DUN APN for Koodo CA (302-220)
 2015-01-08 19:16:29 +00:00
Craig Mautner
125b725f46 Merge "Remove AppWindowTokens from exiting apps with task" into lmp-mr1-dev 
automerge: 62a32ee

* commit '62a32ee1dfff6921fd95c92068500af6b8b3f47e':
  Remove AppWindowTokens from exiting apps with task
 2015-01-08 19:13:38 +00:00
Sanket Padawe
720b3a04a4 Merge "Removing DUN APN for Koodo CA (302-220)" into lmp-mr1-dev 
automerge: d3b6956

* commit 'd3b69567e3b6891574b8f06e3fc88ba91d4f7436':
  Removing DUN APN for Koodo CA (302-220)
 2015-01-08 19:12:28 +00:00
Craig Mautner
62a32ee1df Merge "Remove AppWindowTokens from exiting apps with task" into lmp-mr1-dev 2015-01-08 19:09:42 +00:00
Haitao Feng
67f304e2ca Use NULL instead of 0 when invoking CallStaticVoidMethod 
static void CallStaticVoidMethod is variable argument function.
if pass 0 to the function like: CallStaticVoidMethod(......, 0),
0 will be treated as INT data type.but in the CallStaticVoidMethod
implement 0 will be treated as pointer data type.Pointer in 64bit
system occupied 8 bytes, but in 64bit system int occupied 4 bytes.
if call function like: CallStaticVoidMethod(......, 0),
only low 4 bytes will be assigned 0.Turned out it actually call
function like this: CallStaticVoidMethod(......, 0xXXXXXXXX00000000).
intent to pass NULL to function but passed non-NULL parameter to
the function.this will cause GCDaemon crash.

Bug: 18911458
Change-Id: I9d700d3790a80dbee6826f64baf9ef5d81ca390f
Reviewed-by: Liao, Bruce <bruce.liao@intel.com>
Signed-off-by: Yong Yao <yong.yao@intel.com>
 2015-01-08 19:09:22 +00:00
Sanket Padawe
d3b69567e3 Merge "Removing DUN APN for Koodo CA (302-220)" into lmp-mr1-dev 2015-01-08 19:08:08 +00:00
Sanket Padawe
cb2dc52aa6 Removing DUN APN for Koodo CA (302-220) 
Bug: 18813997
Change-Id: I7d129dfa0015d8a1d01e749dafcb7d95f837a5ec
 2015-01-08 11:05:43 -08:00
Dianne Hackborn
29cd7f1962 Fix issue #18827122: system server crashed on broadcasting... 
...an intent with invalid or null package uri

Also tweak battery stats to record in the history when we shut
down, to understand when restarts are due to clean shutdowns or
crashes.

Change-Id: I6443dafc23e356be9f569906f6081152d4f92d2b
 2015-01-08 10:58:45 -08:00
Craig Mautner
3d7ca31c9e Remove AppWindowTokens from exiting apps with task 
When the task is removed from a task stack in window manager any
exiting activities left in the stack were orphaned. This led to a
memory leak. Removing all task activities from those that are exiting
fixes this problem.

Fixes bug 18943737.

Change-Id: I0a5ea8d2d3be89af7ccaf01385a226a2eafdf507
 2015-01-08 10:56:00 -08:00
Christoph Studer
f5dcb6cbb9 am 9d4b7963: Merge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-dev 
automerge: bbadf11

* commit 'bbadf1161aacafd80182dda080534a123a7204ef':
  NoMan: Cancel previous instance of ignored notification
 2015-01-08 18:51:48 +00:00
Christoph Studer
bbadf1161a am 9d4b7963: Merge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-dev 
* commit '9d4b7963399045395799dcb7df5d8c84d9b12884':
  NoMan: Cancel previous instance of ignored notification
 2015-01-08 18:49:53 +00:00
Christoph Studer
9d4b796339 Merge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-dev 2015-01-08 18:44:24 +00:00
Craig Mautner
52657361d0 Merge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-dev automerge: 28a4cea -s ours 
automerge: 7cd49c6  -s ours

* commit '7cd49c6c3a2678510a278f28514c73dcbaae8957':
  Fix pointer index out of range exception DO NOT MERGE
 2015-01-08 18:37:43 +00:00
Craig Mautner
7cd49c6c3a Merge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-dev 
automerge: 28a4cea  -s ours

* commit '28a4cea5a0f8d0e33b9d6a3283d31cc1e976c74c':
  Fix pointer index out of range exception DO NOT MERGE
 2015-01-08 18:35:32 +00:00
Craig Mautner
28a4cea5a0 Merge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-dev 2015-01-08 18:34:02 +00:00
Dianne Hackborn
8fa0935335 Merge "Add new debug feature to track associations between processes. Also add some debugging for spurious service ANRs." into lmp-mr1-dev automerge: a7881fd 
automerge: 30ae442

* commit '30ae442133c55d4aa3636127de556736b2eaa99f':
  Add new debug feature to track associations between processes.  Also add some debugging for spurious service ANRs.
 2015-01-08 18:17:33 +00:00
Dianne Hackborn
30ae442133 Merge "Add new debug feature to track associations between processes. Also add some debugging for spurious service ANRs." into lmp-mr1-dev 
automerge: a7881fd

* commit 'a7881fd30b973f923c98d53bddf397d744b4229c':
  Add new debug feature to track associations between processes.  Also add some debugging for spurious service ANRs.
 2015-01-08 18:11:31 +00:00
Dianne Hackborn
a7881fd30b Merge "Add new debug feature to track associations between processes. Also add some debugging for spurious service ANRs." into lmp-mr1-dev 2015-01-08 18:08:13 +00:00
Andres Morales
7628fac99f Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev automerge: d656955 
automerge: c9a7694

* commit 'c9a76941ecca457e6a17b06f557c24e18e3bdafa':
  Wipe FRP partition if OEM unlock enabled
 2015-01-08 16:15:47 +00:00
Andres Morales
c9a76941ec Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev 
automerge: d656955

* commit 'd656955efdd2e148d9390125b899e8fe2b677abd':
  Wipe FRP partition if OEM unlock enabled
 2015-01-08 16:13:17 +00:00
Andres Morales
d656955efd Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev 2015-01-08 16:10:27 +00:00
tingna_sung
1ab7d3b9a8 Fix pointer index out of range exception DO NOT MERGE 
Avoid pointer index out of range error if return value is -1 of
findPointerIndex() when there is no data available for that pointer
identifier.

Change-Id: I2a08f04c678164e220852094baa124ba157e2e42
Signed-off-by: tingna_sung <tingna_sung@htc.com>

Fixes bug 18883936
 2015-01-08 15:57:52 +00:00
Vladimir Marko
371d77ecf6 resolved conflicts for merge of 36401a36 to lmp-mr1-dev-plus-aosp 
Change-Id: Ic280478a5979a47cac148c0eac9bdfd20ec0e6e7
 2015-01-08 10:46:53 +00:00
Vladimir Marko
36401a3699 am e9a935f6: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()." into lmp-mr1-dev 
* commit 'e9a935f6b60f5abaf9cdbd45f18d2e8c0a9c6bd8':
  Check for OOM in BitmapFactory's getMimeTypeString().
 2015-01-08 10:28:27 +00:00
Vladimir Marko
e9a935f6b6 Merge "Check for OOM in BitmapFactory's getMimeTypeString()." into lmp-mr1-dev 2015-01-08 10:24:51 +00:00
Bryce Lee
1cad8899be Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev automerge: c010c96 
automerge: d1646dc

* commit 'd1646dcfd1d40bdc094f34e05c1359cfc3fa7c65':
  Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
 2015-01-08 04:38:01 +00:00
Bryce Lee
d1646dcfd1 Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev 
automerge: c010c96

* commit 'c010c96fdf143b242c9795a71b231ccb4658b625':
  Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
 2015-01-08 04:32:40 +00:00
Bryce Lee
c010c96fdf Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev 2015-01-08 04:30:13 +00:00
Jinsuk Kim
764a1ba86d am 62a1e753: Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput" into lmp-mr1-dev automerge: 09d4e03 
* commit '62a1e753b1f73f575c978a377efdc531e7a86b8f':
  CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput
 2015-01-08 04:18:01 +00:00
Jinsuk Kim
62a1e753b1 Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput" into lmp-mr1-dev 
automerge: 09d4e03

* commit '09d4e03736caa1baf07256fc5cd6d61b264021a7':
  CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput
 2015-01-08 04:11:47 +00:00
Jinsuk Kim
09d4e03736 Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput" into lmp-mr1-dev 2015-01-08 04:08:54 +00:00
Jinsuk Kim
6e26f7f7b0 CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput 
Resolves a timing-related bug that fails to process the command
<Active Source> at TV boot up. Checks if TV input required for
the command is ready to accept the request. If not, makes sure
the command is buffered, and processed later when the input is
ready.

Bug: 18896770

Change-Id: Id17e5e8468519b17daf61c962dd718ccc56fb0ea
 2015-01-08 12:51:22 +09:00
Bryce Lee
7c91446769 Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." 
This reverts commit fabbdf7204474a9f789ce441219b3b9f3df66bb8.

Causes NPE on devices without telephony (Android Wear for example)
Bug:18922524

Change-Id: I3be4187a20da11fd5a302dd88e808a68cd7e5737
 2015-01-08 02:32:08 +00:00
Deepanshu Gupta
321bf43315 am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev 
automerge: 03c822a

* commit '03c822aa585c319fb9cd05f392d8518501cc4f79':
  Replace java.util.LinkedHashMap.eldest()
 2015-01-08 01:49:23 +00:00
Deepanshu Gupta
f0da92bfda am 169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-dev 
automerge: 33b2de7

* commit '33b2de7f34180983fe596ff9faa6955b032fa157':
  Add missing DateFormat method.
 2015-01-08 01:47:52 +00:00
Deepanshu Gupta
f45420d0bd am 565b6b41: Merge "Update platform.dir search in tests." into lmp-mr1-dev 
automerge: 7e39385

* commit '7e393853656387757da2531d4e504d7cf32e738e':
  Update platform.dir search in tests.
 2015-01-08 01:46:46 +00:00
Deepanshu Gupta
03c822aa58 am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev 
* commit '2d14feb4c7185008111f3a6340f114a4c891e01c':
  Replace java.util.LinkedHashMap.eldest()
 2015-01-08 01:38:44 +00:00
Deepanshu Gupta
2d14feb4c7 Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev 2015-01-08 01:31:55 +00:00
Deepanshu Gupta
33b2de7f34 am 169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-dev 
* commit '169c11dd39ec44364168785a7a83fb747e893c9a':
  Add missing DateFormat method.
 2015-01-08 01:23:35 +00:00
Deepanshu Gupta
7e39385365 am 565b6b41: Merge "Update platform.dir search in tests." into lmp-mr1-dev 
* commit '565b6b415a18ee0b99af8cb693b980e57136282b':
  Update platform.dir search in tests.
 2015-01-08 01:23:30 +00:00