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

118370 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
1e3395c737 am 105b545e: am 0dce19ca: am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes" 
* commit '105b545ec0ad5ea4f723f8d8b06de37f68c2f6c3':
  AArch64: Use long for pointers in MTP classes
 2014-01-07 13:07:02 +00:00
Narayan Kamath
510616d215 am bec733af: am 23ebc24e: am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes" 
* commit 'bec733af11a428cb202a552ff297ce43f0411f78':
  AArch64: Use long for pointers in VideoEditor classes
 2014-01-07 13:06:57 +00:00
Narayan Kamath
0d8c3c469e am 5f83ff6f: am e7d7908c: am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver" 
* commit '5f83ff6ffa82fb84df6feab4339054b302ac391e':
  AArch64: Use long for pointers in DisplayEventReceiver
 2014-01-07 13:06:52 +00:00
Narayan Kamath
113e83e6f5 am 58cb0f0c: am bfbe585e: am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes" 
* commit '58cb0f0c412e5405f866ef0561e593b8c99bfada':
  AArch64: Use long for pointers in audio effect classes
 2014-01-07 13:06:47 +00:00
Narayan Kamath
99aec6b5d1 am 40b0aaa9: am 568cde55: am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream" 
* commit '40b0aaa9201095f408551510ddd353dcf8c8ae26':
  AArch64: Use long for pointers in AmrInputStream
 2014-01-07 13:06:42 +00:00
Narayan Kamath
105b545ec0 am 0dce19ca: am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes" 
* commit '0dce19caf81c3e2090e80800957216c1d5fe66b8':
  AArch64: Use long for pointers in MTP classes
 2014-01-07 13:04:19 +00:00
Narayan Kamath
bec733af11 am 23ebc24e: am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes" 
* commit '23ebc24eee4bf8b58405daab177e46d8e3da790f':
  AArch64: Use long for pointers in VideoEditor classes
 2014-01-07 13:04:14 +00:00
Narayan Kamath
5f83ff6ffa am e7d7908c: am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver" 
* commit 'e7d7908c28adf77de2cefba4f2a554b770d49def':
  AArch64: Use long for pointers in DisplayEventReceiver
 2014-01-07 13:04:10 +00:00
Narayan Kamath
58cb0f0c41 am bfbe585e: am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes" 
* commit 'bfbe585ed4360b007640b227d49b6e8d7a2352b0':
  AArch64: Use long for pointers in audio effect classes
 2014-01-07 13:04:06 +00:00
Narayan Kamath
40b0aaa920 am 568cde55: am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream" 
* commit '568cde557abfaaa5bf584cf7c3396f9efd990e6c':
  AArch64: Use long for pointers in AmrInputStream
 2014-01-07 13:04:01 +00:00
Narayan Kamath
0dce19caf8 am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes" 
* commit '79ceb53ae5b867a954476e3f6499f89664fbc669':
  AArch64: Use long for pointers in MTP classes
 2014-01-07 05:01:13 -08:00
Narayan Kamath
23ebc24eee am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes" 
* commit '08467c5727c04c1fef40ff1e361628944275ef28':
  AArch64: Use long for pointers in VideoEditor classes
 2014-01-07 05:01:08 -08:00
Narayan Kamath
e7d7908c28 am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver" 
* commit '02baba25545b232436502a73e2928a1d72fa240e':
  AArch64: Use long for pointers in DisplayEventReceiver
 2014-01-07 05:01:03 -08:00
Narayan Kamath
bfbe585ed4 am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes" 
* commit 'c0c92f206eddb6fb319bd11929c1703daf17248f':
  AArch64: Use long for pointers in audio effect classes
 2014-01-07 05:00:58 -08:00
Narayan Kamath
568cde557a am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream" 
* commit '80cff94478a39914012df816179ea57c53040903':
  AArch64: Use long for pointers in AmrInputStream
 2014-01-07 05:00:53 -08:00
Narayan Kamath
79ceb53ae5 am c58abeea: Merge "AArch64: Use long for pointers in MTP classes" 
* commit 'c58abeeae34c77559c00c7d967c77443469abeef':
  AArch64: Use long for pointers in MTP classes
 2014-01-07 04:58:23 -08:00
Narayan Kamath
08467c5727 am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes" 
* commit '9bc6acf27ac446b7e18a51a926caafd99cf34713':
  AArch64: Use long for pointers in VideoEditor classes
 2014-01-07 04:54:46 -08:00
Narayan Kamath
02baba2554 am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver" 
* commit '670327544184dbd6274de9127ceaf20dfd5801b4':
  AArch64: Use long for pointers in DisplayEventReceiver
 2014-01-07 04:54:42 -08:00
Narayan Kamath
c0c92f206e am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes" 
* commit '357ea90515025d806c6360ef846bf6f84b45a64e':
  AArch64: Use long for pointers in audio effect classes
 2014-01-07 04:54:35 -08:00
Narayan Kamath
c58abeeae3 Merge "AArch64: Use long for pointers in MTP classes" 2014-01-07 12:54:11 +00:00
Ashok Bhat
e2e59326f1 AArch64: Use long for pointers in MTP classes 
For storing pointers, long is used in MTP 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: I67805547251722e7b77611d47d0bb632a64d3e6d
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-07 12:52:57 +00:00
Narayan Kamath
80cff94478 am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream" 
* commit '74675f29133ff36dccc95387392bf3654dc94e15':
  AArch64: Use long for pointers in AmrInputStream
 2014-01-07 04:50:56 -08:00
Narayan Kamath
9bc6acf27a Merge "AArch64: Use long for pointers in VideoEditor classes" 2014-01-07 12:50:07 +00:00
Ashok Bhat
44ba5c1b4e AArch64: Use long for pointers in VideoEditor classes 
For storing pointers, long is used in VideoEditor
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: Ifff3a28f2ab6774ee89d31770ad63451c8726431
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-07 12:49:41 +00:00
Narayan Kamath
6703275441 Merge "AArch64: Use long for pointers in DisplayEventReceiver" 2014-01-07 12:49:27 +00:00
Ashok Bhat
27285821b7 AArch64: Use long for pointers in DisplayEventReceiver 
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: I3c0855373c0e4bedc172adb82b103586de9219dc
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-01-07 12:48:43 +00:00
Narayan Kamath
357ea90515 Merge "AArch64: Use long for pointers in audio effect classes" 2014-01-07 12:48:21 +00:00
Ashok Bhat
ea7861c918 AArch64: Use long for pointers in audio effect classes 
For storing pointers, long is used in AudioEffect
and Visualizer 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: Ief49bbe5baef663e268c7f6d70ac33a4df45621c
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-07 12:47:51 +00:00
Narayan Kamath
74675f2913 Merge "AArch64: Use long for pointers in AmrInputStream" 2014-01-07 12:45:06 +00:00
Ashok Bhat
b348c3fd87 AArch64: Use long for pointers in AmrInputStream 
For storing pointers, long is used in AmrInputStream
class, as native pointers can be 64-bit.

Change-Id: I78fff3eb54fc7101746b0d693cbc4e923c2bad08
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-07 12:44:38 +00:00
Narayan Kamath
d2098682ab am 3f2843a4: am c47b7d37: am 9d4ebdca: am cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys." 
* commit '3f2843a447f037492cf6d2fde928ef88a1d77bc8':
  XmlUtils#readThisMapXml should handle null keys.
 2014-01-07 10:14:00 +00:00
Narayan Kamath
107eb74074 am ce9418c5: am c797fd61: am c9e27802: am 7e296254: Merge "Fix broken XML parsing idiom." 
* commit 'ce9418c59e1c9e696b35123d75c077c164893b9f':
  Fix broken XML parsing idiom.
 2014-01-07 10:13:53 +00:00
Narayan Kamath
3f2843a447 am c47b7d37: am 9d4ebdca: am cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys." 
* commit 'c47b7d377c4785f84a22c42c6a99716cceb5973c':
  XmlUtils#readThisMapXml should handle null keys.
 2014-01-07 10:10:49 +00:00
Narayan Kamath
ce9418c59e am c797fd61: am c9e27802: am 7e296254: Merge "Fix broken XML parsing idiom." 
* commit 'c797fd614d28a0c5c3aacbff325e9de572d7f091':
  Fix broken XML parsing idiom.
 2014-01-07 10:10:45 +00:00
Narayan Kamath
c47b7d377c am 9d4ebdca: am cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys." 
* commit '9d4ebdcafaa6a3f29978a7095f2bc3cbe0d5240a':
  XmlUtils#readThisMapXml should handle null keys.
 2014-01-07 02:08:02 -08:00
Narayan Kamath
c797fd614d am c9e27802: am 7e296254: Merge "Fix broken XML parsing idiom." 
* commit 'c9e27802f049b9c3086770a7710b421ce33d2791':
  Fix broken XML parsing idiom.
 2014-01-07 02:07:56 -08:00
Narayan Kamath
9d4ebdcafa am cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys." 
* commit 'cf1aa551eed7be4310a386b9b9e458e46847207a':
  XmlUtils#readThisMapXml should handle null keys.
 2014-01-07 02:05:39 -08:00
Narayan Kamath
c9e27802f0 am 7e296254: Merge "Fix broken XML parsing idiom." 
* commit '7e29625463e6034147c24992d0ad319ddf426088':
  Fix broken XML parsing idiom.
 2014-01-07 02:05:35 -08:00
Narayan Kamath
cf1aa551ee Merge "XmlUtils#readThisMapXml should handle null keys." 2014-01-07 10:03:21 +00:00
Narayan Kamath
7e29625463 Merge "Fix broken XML parsing idiom." 2014-01-07 10:02:57 +00:00
quddusc
9795592c3c am 976b0d13: am fd08cd48: am 0d4068ad: am ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs 
* commit '976b0d135a87217212e0294b8e4ab07a6034f179':
  docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477
 2014-01-07 00:41:21 +00:00
Baligh Uddin
ff1f1c452c am 24c2980c: (-s ours) am be24e41b: (-s ours) am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '24c2980cb2a9a93d1d6fe2a849f915b3819056c2':
  Import translations. DO NOT MERGE
 2014-01-07 00:41:17 +00:00
Baligh Uddin
a9bec69a95 am fce88971: (-s ours) am f256f49f: (-s ours) am 258bd63f: (-s ours) am 6e15a49e: (-s ours) Import translations. DO NOT MERGE 
* commit 'fce889710225bfefd99af59afb83085b23a79704':
  Import translations. DO NOT MERGE
 2014-01-07 00:41:12 +00:00
quddusc
976b0d135a am fd08cd48: am 0d4068ad: am ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs 
* commit 'fd08cd4852e285434e9067e09cad41bef28068ca':
  docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477
 2014-01-07 00:37:50 +00:00
Baligh Uddin
24c2980cb2 am be24e41b: (-s ours) am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'be24e41b41e9ccec3bb685baf9dc951b386116ee':
  Import translations. DO NOT MERGE
 2014-01-07 00:37:46 +00:00
Baligh Uddin
fce8897102 am f256f49f: (-s ours) am 258bd63f: (-s ours) am 6e15a49e: (-s ours) Import translations. DO NOT MERGE 
* commit 'f256f49f9fddbd035375ea8c6444cf7fa36418ca':
  Import translations. DO NOT MERGE
 2014-01-07 00:37:41 +00:00
quddusc
fd08cd4852 am 0d4068ad: am ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs 
* commit '0d4068ad1cbc8b8c550118c2214eb70116b83f81':
  docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477
 2014-01-06 16:30:35 -08:00
Baligh Uddin
be24e41b41 am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '2c4d6d91e21ae678cff7b9ee2c78ffd0681d5da2':
  Import translations. DO NOT MERGE
 2014-01-06 16:30:30 -08:00
Baligh Uddin
f256f49f9f am 258bd63f: (-s ours) am 6e15a49e: (-s ours) Import translations. DO NOT MERGE 
* commit '258bd63f38d90ac96aac5eb4e3a5c696e8b089f8':
  Import translations. DO NOT MERGE
 2014-01-06 16:30:25 -08:00
Conley Owens
5b44325fff am 849ab14d: am 7f16047b: am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config" 
* commit '849ab14d7237d3474f6dde3731ab65624ac297ac':
  CompoundButton: Let text can be changed by config
 2014-01-06 23:48:58 +00:00