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

179644 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Gilad
95cde2dc21 API to satisfy the dependency in https://go/contacthandler1135 
Bug: 17586396
Change-Id: I10bad15b4db3ec8928316507119c529c5d1f304b
 2015-01-08 17:56:28 -08:00
Dianne Hackborn
adf1c93ff7 am 3968820f: am cb8d8e10: Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev automerge: 16e4324 
* commit '3968820fc75e1eac03e54cba45b5a0adc28ee87d':
  Fix issue #18827122: system server crashed on broadcasting...
 2015-01-08 21:55:28 +00:00
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
1b4e87398a am 31ef8ef5: Merge "Use NULL instead of 0 when invoking CallStaticVoidMethod" into lmp-mr1-dev automerge: 92160ba 
automerge: a4f8397

* commit 'a4f8397d91c1d37b39cf24f3727b0ea15280a531':
  Use NULL instead of 0 when invoking CallStaticVoidMethod
 2015-01-08 20:32:35 +00:00
Adam Lesinski
e5b8a0896e am c04a21a0: Merge "Fixup aapt usage message" automerge: 64044d0 
automerge: 6e2eb2d

* commit '6e2eb2df4cb8ca4d0eeda0fb38e1a67136a0d275':
  Fixup aapt usage message
 2015-01-08 20:31:12 +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
RoboErik
effe42e253 Merge "Reload MediaBrowser children on each call to subscribe" 2015-01-08 19:54:34 +00:00
Alan Viverette
1a1779de29 Merge "Fix bad super call in PhoneStatusBarView accessibility" 2015-01-08 19:26:30 +00:00
Fyodor Kupolov
56ef86d4d1 Merge "Use scheduled writes to package-restrictions and user xml" 2015-01-08 19:25:45 +00:00
Craig Mautner
b533d116ef am 0e2fdb43: Merge "Remove AppWindowTokens from exiting apps with task" into lmp-mr1-dev automerge: 62a32ee automerge: 125b725 
* commit '0e2fdb43122c53c3a63bc3810c93c30083d92866':
  Remove AppWindowTokens from exiting apps with task
 2015-01-08 19:24:57 +00:00
Sanket Padawe
8b2a15ed39 am b3096a34: Merge "Removing DUN APN for Koodo CA (302-220)" into lmp-mr1-dev automerge: d3b6956 automerge: 720b3a0 
* commit 'b3096a344e739300d11d31207a2744b2b0870a08':
  Removing DUN APN for Koodo CA (302-220)
 2015-01-08 19:24:52 +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
Alan Viverette
23afdde42c Merge "Use text ascent / descent to center SimpleMonthView labels" 2015-01-08 19:16:30 +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
John Reck
25bd5d6b04 Merge "Replace sleep() hack with vsync listening" 2015-01-08 19:15:31 +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
Alan Viverette
5b0467522c Fix bad super call in PhoneStatusBarView accessibility 
Change-Id: Ie18e6c9b74dce498c1c830ce983a73aa619c6df3
 2015-01-08 11:13:06 -08:00
Alan Viverette
5dc973cb03 Use text ascent / descent to center SimpleMonthView labels 
Also updates Canvas.drawText() docs to clarify that the y-origin is
actually the baseline rather than the top (which is what developers
expect).

BUG: 18864682
Change-Id: Ibfa2a79327d17b5135f90468195fbeca922a25c8
 2015-01-08 11:12:39 -08: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
Christoph Studer
7bfbddfd5b am f5dcb6cb: am 9d4b7963: Merge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-dev automerge: bbadf11 
* commit 'f5dcb6cbb9db1099e458b9a7df0a21baffbf77cc':
  NoMan: Cancel previous instance of ignored notification
 2015-01-08 18:59:45 +00: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
a09c49a048 am 52657361: (-s ours) Merge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-dev automerge: 28a4cea -s ours automerge: 7cd49c6 -s ours 
* commit '52657361d04719f62b9cea57ea9d0e8c780ce874':
  Fix pointer index out of range exception DO NOT MERGE
 2015-01-08 18:44:18 +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
9c088fc8e7 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 
automerge: 8fa0935

* commit '8fa0935335ec5b9174e01acf861c58972a72aeab':
  Add new debug feature to track associations between processes.  Also add some debugging for spurious service ANRs.
 2015-01-08 18:23:30 +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
a6084bbda4 Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev automerge: d656955 automerge: c9a7694 
automerge: 7628fac

* commit '7628fac99fb23b71ae418b9833bc7e5d534c1e9a':
  Wipe FRP partition if OEM unlock enabled
 2015-01-08 16:21:37 +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
Marcin Kosiba
3e853fb1d2 Un-break the WebView build. 
This renames methods that have been renamed in
Ib9d403156c1fc4fb04f65f3c126d1277a44b3740 back to their original
names.

Change-Id: I07b2fb94b21c42c36958855d19d996f96b0ce5c4
 2015-01-08 12:45:40 +00:00