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

118432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
88bfc6ddc8 Merge "Extend stack management to other displays." into klp-modular-dev 2014-01-08 17:33:42 +00:00
Mike Lockwood
43bc1c07d2 am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit 'd9e708e365d94e83ec135f1486129febd3f8eaea':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 16:08:17 +00:00
Mike Lockwood
d9e708e365 am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '12ec2e6d71bc69ca11946f7f051931863c934273':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 16:05:29 +00:00
Mike Lockwood
12ec2e6d71 am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '992065938a95e5273b22dea009b8581bcc693e61':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 08:01:42 -08:00
Mike Lockwood
992065938a am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '9607d78f5144792993bd254a4b5983b2a9d5bf83':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 07:59:06 -08:00
Mike Lockwood
9607d78f51 Merge "Added missing USB device descriptor fields needed for intent filters" 2014-01-08 15:56:13 +00:00
Narayan Kamath
e853de1f10 am 2d87407e: am 136c0219: am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712" 
* commit '2d87407e5765228a3469b9681ebff6c0c7eee140':
  Fix a bug introduced in change 73712
 2014-01-08 13:06:55 +00:00
Narayan Kamath
2d87407e57 am 136c0219: am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712" 
* commit '136c02191790aa937c490341df49e966735f6857':
  Fix a bug introduced in change 73712
 2014-01-08 13:04:15 +00:00
Narayan Kamath
136c021917 am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712" 
* commit 'c156021debb8e13324e451cb288da7edd7e112ca':
  Fix a bug introduced in change 73712
 2014-01-08 05:00:33 -08:00
Narayan Kamath
c156021deb am 8a927cfa: Merge "Fix a bug introduced in change 73712" 
* commit '8a927cfa4ea8e4a78f6a9fa1e2b1da9187a3d1e8':
  Fix a bug introduced in change 73712
 2014-01-08 04:49:24 -08:00
Narayan Kamath
8a927cfa4e Merge "Fix a bug introduced in change 73712" 2014-01-08 12:47:31 +00:00
Narayan Kamath
db47efd3f8 am 651807fc: am 3f589e5d: am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup" 
* commit '651807fcd0b1012ea848efe5f67b4381d8ce6797':
  AArch64: Use long for pointers in App/Backup
 2014-01-08 12:33:16 +00:00
Narayan Kamath
55a12adc19 am 72a8fe6d: am 74661ff1: am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers" 
* commit '72a8fe6d03a7c9e88e8fdd7181ca6896a2d475eb':
  AArch64: Use long for pointers
 2014-01-08 12:33:11 +00:00
Narayan Kamath
29eadb328a am 9a743575: am 71cdc73d: am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes" 
* commit '9a743575254d7d5d456456517171f0ee31bc9247':
  AArch64: Use long for pointers in hardware classes
 2014-01-08 12:33:06 +00:00
Narayan Kamath
87d6cd4537 Fix a bug introduced in change 73712 
"return (bool) true" was incorrectly changed to
"return (jboolean) JNI_FALSE"

Change-Id: I45f62f60c5affbae7970bb8889c55981e26d01ba
 2014-01-08 12:26:28 +00:00
Narayan Kamath
3f7b8d0c6c resolved conflicts for merge of 92ae0347 to klp-modular-dev 
Change-Id: I703aea4f20985a4bbda0f685254721d6480bb20f
 2014-01-08 12:19:40 +00:00
Narayan Kamath
651807fcd0 am 3f589e5d: am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup" 
* commit '3f589e5d1e09e17a2aaa0a52fc15e16520d1bd5a':
  AArch64: Use long for pointers in App/Backup
 2014-01-08 12:05:13 +00:00
Narayan Kamath
3f589e5d1e am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup" 
* commit '2842bd021c11274720d6a10219538b536b7d2050':
  AArch64: Use long for pointers in App/Backup
 2014-01-08 04:02:05 -08:00
Narayan Kamath
72a8fe6d03 am 74661ff1: am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers" 
* commit '74661ff119b274e58d1b2f15cff97cfa6a1e64fa':
  AArch64: Use long for pointers
 2014-01-08 12:01:13 +00:00
Narayan Kamath
9a74357525 am 71cdc73d: am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes" 
* commit '71cdc73d2808944fca0a9e200696253d1f4a5bf4':
  AArch64: Use long for pointers in hardware classes
 2014-01-08 12:01:09 +00:00
Narayan Kamath
92ae034756 am cbf339f6: am ab169215: am f210044f: Merge "AArch64: Use long for pointers in services" 
* commit 'cbf339f6e4bf45a7d41cd0327d2dd7975875b8aa':
  AArch64: Use long for pointers in services
 2014-01-08 12:01:04 +00:00
Narayan Kamath
2842bd021c am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup" 
* commit 'de8c3cf13b0fc0655cf49934658e652b441ee019':
  AArch64: Use long for pointers in App/Backup
 2014-01-08 03:59:46 -08:00
Narayan Kamath
74661ff119 am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers" 
* commit 'b5558817c78e3140fa3f9cbbe167cacf6481f47f':
  AArch64: Use long for pointers
 2014-01-08 03:58:22 -08:00
Narayan Kamath
71cdc73d28 am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes" 
* commit '53acc7ae00ba921e8c7afb9415dbf473785a3be6':
  AArch64: Use long for pointers in hardware classes
 2014-01-08 03:58:17 -08:00
Narayan Kamath
cbf339f6e4 am ab169215: am f210044f: Merge "AArch64: Use long for pointers in services" 
* commit 'ab169215fb135f590f0960ab89f5199dd7303a33':
  AArch64: Use long for pointers in services
 2014-01-08 03:58:13 -08:00
Narayan Kamath
b5558817c7 am 002ae75b: Merge "AArch64: Use long for pointers" 
* commit '002ae75b829730047240ab20a044a00570eb71d2':
  AArch64: Use long for pointers
 2014-01-08 03:56:00 -08:00
Narayan Kamath
53acc7ae00 am f5598210: Merge "AArch64: Use long for pointers in hardware classes" 
* commit 'f5598210f067acf340487ba2fe55b00e43be1d9d':
  AArch64: Use long for pointers in hardware classes
 2014-01-08 03:55:56 -08:00
Narayan Kamath
ab169215fb am f210044f: Merge "AArch64: Use long for pointers in services" 
* commit 'f210044fb8e2f6c056e5314702353d7b97d64978':
  AArch64: Use long for pointers in services
 2014-01-08 03:55:52 -08:00
Narayan Kamath
de8c3cf13b Merge "AArch64: Use long for pointers in App/Backup" 2014-01-08 11:54:29 +00:00
Ashok Bhat
58b8b24256 AArch64: Use long for pointers in App/Backup 
For storing pointers, long is used, as
native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I7aee49dc26cf6c86af8f1d882e9cd1cc145a1977
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
 2014-01-08 11:54:01 +00:00
Narayan Kamath
002ae75b82 Merge "AArch64: Use long for pointers" 2014-01-08 11:53:51 +00:00
Ashok Bhat
738702d28a AArch64: Use long for pointers 
For storing pointers, long is used in CursorWindow
and SQLiteConnection classes as native pointers can
be 64-bit.

Change-Id: Ia686006a7b8bdc7b95e5de0d0a294b155034a921
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
 2014-01-08 11:53:21 +00:00
Narayan Kamath
f5598210f0 Merge "AArch64: Use long for pointers in hardware classes" 2014-01-08 11:53:12 +00:00
Narayan Kamath
f210044fb8 Merge "AArch64: Use long for pointers in services" 2014-01-08 11:53:00 +00:00
Ashok Bhat
4838e33812 AArch64: Use long for pointers in hardware classes 
For storing pointers, long is used in hardware classes,
as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: Icdeb67f9273fb2d8f6d88ca68d7f7d0950796fc1
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
 2014-01-08 10:17:21 +00:00
Ashok Bhat
7e2a9dcf1a AArch64: Use long for pointers in services 
For storing pointers, long is used, as native pointers
can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: Ib4435f0794740d545c1e640087849215e6844802
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
 2014-01-08 10:06:07 +00:00
Robert Greenwalt
080d1bdd7f am 132a5537: am 400e6b70: am cbf5e875: am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network"" 
* commit '132a55375e89d809e1cc116aa4cca49e2351294a':
  Revert "Do not show roaming icon for Videotron operator when access Canada network"
 2014-01-08 00:50:16 +00:00
Robert Greenwalt
132a55375e am 400e6b70: am cbf5e875: am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network"" 
* commit '400e6b705f860fe70264a8b2d73c82772d734ad7':
  Revert "Do not show roaming icon for Videotron operator when access Canada network"
 2014-01-08 00:47:37 +00:00
Robert Greenwalt
400e6b705f am cbf5e875: am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network"" 
* commit 'cbf5e8758ff9ef2eb21228fba20c962002f1e42d':
  Revert "Do not show roaming icon for Videotron operator when access Canada network"
 2014-01-07 16:44:30 -08:00
Robert Greenwalt
cbf5e8758f am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network"" 
* commit '517e9b11d53609d59c60d22dc085e7f9fd442248':
  Revert "Do not show roaming icon for Videotron operator when access Canada network"
 2014-01-07 16:41:16 -08:00
Robert Greenwalt
517e9b11d5 Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network"" 2014-01-08 00:38:29 +00:00
Ian Rogers
878df18c48 am 8dbfde50: am 0e16e3d7: am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime" 
* commit '8dbfde504787a002de1074a5dfac7eea9d060a43':
  Add a call to registerAppInfo for the VMRuntime
 2014-01-07 21:45:07 +00:00
Ian Rogers
8dbfde5047 am 0e16e3d7: am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime" 
* commit '0e16e3d7ddcca8fe68bc747b88159eeb6b161785':
  Add a call to registerAppInfo for the VMRuntime
 2014-01-07 21:41:34 +00:00
Ian Rogers
0e16e3d7dd am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime" 
* commit 'c2b50c10f0bf636562deba1d92ec7b54b13909de':
  Add a call to registerAppInfo for the VMRuntime
 2014-01-07 13:38:44 -08:00
Ian Rogers
c2b50c10f0 am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime" 
* commit 'f11dee797177760f089e757d91ed6bce32043750':
  Add a call to registerAppInfo for the VMRuntime
 2014-01-07 13:36:29 -08:00
Ian Rogers
f11dee7971 Merge "Add a call to registerAppInfo for the VMRuntime" 2014-01-07 21:31:18 +00:00
Adam Lesinski
66e9b1e117 Merge "Move SystemService code to frameworks/base/core" into klp-modular-dev 2014-01-07 20:53:20 +00:00
Dave Platt
5dd0be2936 am 07290a7b: am 3bbf7e6a: am 62bac75d: am 76e5ca81: Fix descriptor leak after accepting connections 
* commit '07290a7be312c5da63857903dc6931cea5a2f2ea':
  Fix descriptor leak after accepting connections
 2014-01-07 19:59:21 +00:00
Dave Platt
d5d0ab5ba9 am 1b5bc6f8: am bd9acc22: am e966e577: am 02f042dd: Fix socket descriptor leak from Zygote to child app 
* commit '1b5bc6f8f96fc30b651679411a4da00d3fbebaa7':
  Fix socket descriptor leak from Zygote to child app
 2014-01-07 19:59:11 +00:00
Dave Platt
07290a7be3 am 3bbf7e6a: am 62bac75d: am 76e5ca81: Fix descriptor leak after accepting connections 
* commit '3bbf7e6aa5a9eda1cc4b1c57da832ebee3bb5dd8':
  Fix descriptor leak after accepting connections
 2014-01-07 19:55:47 +00:00