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

123603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
a0183b02e4 am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." 
* commit '8868d1290afd96997fef671f4a7a4c7bbf94fa1a':
  MtpDatabase JNI: Fixed incorrect method name in ALOGE.
 2014-06-02 18:28:51 +00:00
Mike Lockwood
1ac54ec69b am 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." 
* commit '750e78bb7626e2e0d5c8feed4a6e4fbe7fe9b5da':
  MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
 2014-06-02 18:28:42 +00:00
Mike Lockwood
8868d1290a am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." 
* commit '1c725866da02c3e1f62fb416ea3450caed406f2a':
  MtpDatabase JNI: Fixed incorrect method name in ALOGE.
 2014-06-02 18:25:35 +00:00
Mike Lockwood
750e78bb76 am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." 
* commit '27eb205e21e7715764084085f382d690e0406c63':
  MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
 2014-06-02 18:25:28 +00:00
Mike Lockwood
1c725866da Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." 2014-06-02 18:21:17 +00:00
Mike Lockwood
27eb205e21 Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." 2014-06-02 18:20:39 +00:00
Andrew Solovay
ec3ade5e8e am 164ecfaa: am be9bf634: am a68757bb: Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs 
* commit '164ecfaa4106952ab77631353d2a94ae13f3c03a':
  docs: Added Sony Mobile Communications to the USB Vendor ID table.
 2014-06-02 17:02:52 +00:00
Andrew Solovay
164ecfaa41 am be9bf634: am a68757bb: Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs 
* commit 'be9bf6344c45f68314e3de9e8712c86bd3d0b1e8':
  docs: Added Sony Mobile Communications to the USB Vendor ID table.
 2014-06-02 16:59:43 +00:00
Andrew Solovay
be9bf6344c am a68757bb: Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs 
* commit 'a68757bb3edfa7b55a349e0b00551a22b6ef9be5':
  docs: Added Sony Mobile Communications to the USB Vendor ID table.
 2014-06-02 16:56:30 +00:00
Andrew Solovay
a68757bb3e Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs 2014-06-02 16:53:46 +00:00
Martin Blumenstingl
986b46d179 MtpDatabase JNI: Fixed incorrect method name in ALOGE. 
Change-Id: I46688cf79f1e7554b28162df2347c4dcb571b8a9
 2014-05-31 16:17:11 +02:00
Martin Blumenstingl
17a24c58bb MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue(). 
The jstring "stringValue" was not never freed.
In the case where "str" was NULL the whole cleanup part (see "goto out")
was even skipped.
This patch makes getObjectPropertyValue() behave like
getObjectPropertyList().

Change-Id: I5a7ec3611036f5253a054b00064999bcd1d1c29e
 2014-05-31 16:17:11 +02:00
Nick Kralevich
532536f145 am daa0ee13: am 4f8785f2: Merge "SELinuxMMAC additions to perform policy versioning checks." 
* commit 'daa0ee137d43850c834b1ead3f871ceaa49814a7':
  SELinuxMMAC additions to perform policy versioning checks.
 2014-05-31 08:51:05 +00:00
Nick Kralevich
332f35813e am 89b88f22: am 3a9835d4: Merge "Allow SELinuxPolicyInstallReceiver to update new policy files." 
* commit '89b88f226928e269e84100154bc78c0f8dc2016e':
  Allow SELinuxPolicyInstallReceiver to update new policy files.
 2014-05-31 08:49:50 +00:00
Nick Kralevich
daa0ee137d am 4f8785f2: Merge "SELinuxMMAC additions to perform policy versioning checks." 
* commit '4f8785f28e6305d427cc3e483248828c9b9b06a2':
  SELinuxMMAC additions to perform policy versioning checks.
 2014-05-31 05:27:46 +00:00
Nick Kralevich
4f8785f28e Merge "SELinuxMMAC additions to perform policy versioning checks." 2014-05-31 05:25:14 +00:00
Nick Kralevich
89b88f2269 am 3a9835d4: Merge "Allow SELinuxPolicyInstallReceiver to update new policy files." 
* commit '3a9835d4914bc959a37eefecf4d5d0d20852e3e7':
  Allow SELinuxPolicyInstallReceiver to update new policy files.
 2014-05-31 05:09:37 +00:00
Nick Kralevich
3a9835d491 Merge "Allow SELinuxPolicyInstallReceiver to update new policy files." 2014-05-31 05:07:13 +00:00
Elliott Hughes
04c987a806 am 79067b3c: am 5568e0e4: Merge "Move frameworks/base off private libcore.ICU API." 
* commit '79067b3cb2f43e62b9a4d46082fb01cbcc513990':
  Move frameworks/base off private libcore.ICU API.
 2014-05-31 02:29:47 +00:00
Elliott Hughes
79067b3cb2 am 5568e0e4: Merge "Move frameworks/base off private libcore.ICU API." 
* commit '5568e0e45fff7ffe5061770cb527b22d09cf5519':
  Move frameworks/base off private libcore.ICU API.
 2014-05-31 02:26:36 +00:00
Elliott Hughes
5568e0e45f Merge "Move frameworks/base off private libcore.ICU API." 2014-05-31 02:22:24 +00:00
Elliott Hughes
570f44b4ab Move frameworks/base off private libcore.ICU API. 
Change-Id: I55355b7ea68174063f31d6bb08a71bcb9dc76d62
 2014-05-30 19:20:20 -07:00
Andrew Solovay
38bb601e78 am 305f3e21: am 79d3b623: am b9c5af3a: Merge "docs: Removed reference to draft apps." into klp-docs 
* commit '305f3e216a52af44e1296795803afe4ce17797ca':
  docs: Removed reference to draft apps.
 2014-05-30 22:43:54 +00:00
Andrew Solovay
305f3e216a am 79d3b623: am b9c5af3a: Merge "docs: Removed reference to draft apps." into klp-docs 
* commit '79d3b623fdcbac0dd47e526d66688227e4559d11':
  docs: Removed reference to draft apps.
 2014-05-30 22:39:35 +00:00
Andrew Solovay
79d3b623fd am b9c5af3a: Merge "docs: Removed reference to draft apps." into klp-docs 
* commit 'b9c5af3aef8591daef88c780f07b04a2d65ee895':
  docs: Removed reference to draft apps.
 2014-05-30 22:34:57 +00:00
Andrew Solovay
b9c5af3aef Merge "docs: Removed reference to draft apps." into klp-docs 2014-05-30 22:32:11 +00:00
Andrew Solovay
be39d67355 docs: Added Sony Mobile Communications to the USB Vendor ID table. 
Doc is staged to:

http://asolovay.mtv:9022/tools/device.html#VendorIds

bug: 15001692
Change-Id: I718679e396b076a370d2b7c3ecad2650274cacd1
 2014-05-30 15:15:49 -07:00
Andrew Solovay
aee20f92b8 docs: Removed reference to draft apps. 
When appropriate, changed references to "draft" apps to alpha and beta apps.
Left the "draft" info in the deprecated file v2/billing_integrate.jd, but
added a note that draft apps are no longer supported.

Docs are staged to:

in-app billing:
http://asolovay.mtv:9011/google/play/billing/billing_admin.html
http://asolovay.mtv:9011/google/play/billing/billing_testing.html

http://asolovay.mtv:9011/google/play/billing/v2/billing_integrate.html
(deprecated doc; just noted that draft is no longer supported)

LVL:
http://asolovay.mtv:9011/google/play/licensing/overview.html
http://asolovay.mtv:9011/google/play/licensing/licensing-reference.html

OBBs
http://asolovay.mtv:9011/google/play/expansion-files.html

As per a request from Dirk, I added a section to the "Testing In-App
Billing" page noting that draft apps are no longer supported, and
linking to the section on alpha and beta channels; I put in a link
to the new section in each place where we'd previously talked about
draft apps.

Also fixed formatting in a few code samples, where over-long lines were
forcing the code box to use a scroll bar.

bug: 15013770
Change-Id: I1368b9b5ebf2a0c22f84fcbcd5f37401b390c423
 2014-05-30 14:38:52 -07:00
Robert Shih
a037bcebfa am a034dac7: android_media_MediaMuxer_setLocation: amended signature. 
* commit 'a034dac7be0658e59c73a880e958cab3c723323b':
  android_media_MediaMuxer_setLocation: amended signature.
 2014-05-30 18:05:35 +00:00
Chris Craik
b68f5f0932 am 4d31c547: am ce7fa780: Merge "Fix a resource race bug in PathCache" 
* commit '4d31c5474bcc4bcc6a6d8dfe232360dad701a3fc':
  Fix a resource race bug in PathCache
 2014-05-30 18:03:32 +00:00
Chris Craik
4d31c5474b am ce7fa780: Merge "Fix a resource race bug in PathCache" 
* commit 'ce7fa780cdee2730b570cc34066f15c74d44e6ef':
  Fix a resource race bug in PathCache
 2014-05-30 17:59:51 +00:00
Chris Craik
ce7fa780cd Merge "Fix a resource race bug in PathCache" 2014-05-30 17:56:42 +00:00
Robert Shih
a034dac7be android_media_MediaMuxer_setLocation: amended signature. 
Change parameter `nativeObject` from type `jint` to `jlong` to match its JNI
signature.

Bug: 15337287
Bug: 12890910
Change-Id: I7feb7fa5c3eccc07f2d1bc733b7d4b3a3b52e292
(cherry picked from commit 3cb78498d3f664f541ba7d28f4543cf8c12733f1)
 2014-05-30 14:56:55 +00:00
Narayan Kamath
f7871c3146 am b9b31f4b: am bd4d3203: Merge "Support an ABI flag for instrumentation." 
* commit 'b9b31f4b8eda123e7b544d1a0fa886576064adca':
  Support an ABI flag for instrumentation.
 2014-05-30 10:49:00 +00:00
Narayan Kamath
b9b31f4b8e am bd4d3203: Merge "Support an ABI flag for instrumentation." 
* commit 'bd4d320344833ce67dad3a4e10a61d0502a81d0e':
  Support an ABI flag for instrumentation.
 2014-05-30 10:41:24 +00:00
Narayan Kamath
bd4d320344 Merge "Support an ABI flag for instrumentation." 2014-05-30 10:35:29 +00:00
yuyang
7061f7d791 Fix a resource race bug in PathCache 
When enabled defer rendering, it will do precache for DrawPathOp.
The paint used for creating PathTask in precache just get the address
of mFilteredPaint of OpenGLRenderer. So for the following defer
operation like DrawTextOp has possibility change the mFilteredPaint
by getPaint while another WorkerThread in PathCache is using the paint
which pointed to the same address of mFilteredPaint to generate bitmap.
As a result, it will generate a wrong bitmap for generateTexture in
PathCache. To fix it, do a copy of paint when creating PathTask.

CRs-Fixed: 664244

Change-Id: I5516f5b143458b88d3573d15b7ebb34f688800c7
 2014-05-30 08:26:37 +05:30
Jeff Brown
92ab0b91cd am aeb4e071: Merge "Add dumpsys to dock observer." into klp-modular-dev 
* commit 'aeb4e071abb100d10c39d154b05c2911d399395d':
  Add dumpsys to dock observer.
 2014-05-30 01:01:17 +00:00
Jeff Brown
aeb4e071ab Merge "Add dumpsys to dock observer." into klp-modular-dev 2014-05-30 00:58:54 +00:00
Jeff Brown
010e561a70 Add dumpsys to dock observer. 
Minor refactoring of dock observer to allow its state to be
inspected and modified via dumpsys for debugging purposes.

eg. View current state.
adb shell dumpsys DockObserver

eg. Simulate being docked.
adb shell dumpsys DockObserver set state 1

eg. Reset back to normal.
adb shell dumpsys DockObserver reset

Change-Id: Ie48db775290ebed9aa4d9d9d5ac5a6fcb6122ac9
 2014-05-29 17:48:33 -07:00
Scott Main
0082933a0d am d897fb53: am e16e367f: am 5ca630e8: Merge "change all the H1 tags to H2s and delete all HR tags then delete all clearflots, because they add useless whitespace once the "headerLine" class is obsolete THEN, cleanup some HTML to fix float clearance issues." into klp- 
* commit 'd897fb533317655a96aa6b38240a85b2093c90e4':
  change all the H1 tags to H2s and delete all HR tags then delete all clearflots, because they add useless whitespace once the "headerLine" class is obsolete THEN, cleanup some HTML to fix float clearance issues.
 2014-05-29 22:59:54 +00:00
Scott Main
d897fb5333 am e16e367f: am 5ca630e8: Merge "change all the H1 tags to H2s and delete all HR tags then delete all clearflots, because they add useless whitespace once the "headerLine" class is obsolete THEN, cleanup some HTML to fix float clearance issues." into klp-docs 
* commit 'e16e367f778b9c3dbdb87ed8ea293f12db97514a':
  change all the H1 tags to H2s and delete all HR tags then delete all clearflots, because they add useless whitespace once the "headerLine" class is obsolete THEN, cleanup some HTML to fix float clearance issues.
 2014-05-29 22:54:03 +00:00
Scott Main
e16e367f77 am 5ca630e8: Merge "change all the H1 tags to H2s and delete all HR tags then delete all clearflots, because they add useless whitespace once the "headerLine" class is obsolete THEN, cleanup some HTML to fix float clearance issues." into klp-docs 
* commit '5ca630e85541b97245d114162772abc4ffd77e97':
  change all the H1 tags to H2s and delete all HR tags then delete all clearflots, because they add useless whitespace once the "headerLine" class is obsolete THEN, cleanup some HTML to fix float clearance issues.
 2014-05-29 22:42:14 +00:00
Scott Main
5ca630e855 Merge "change all the H1 tags to H2s and delete all HR tags then delete all clearflots, because they add useless whitespace once the "headerLine" class is obsolete THEN, cleanup some HTML to fix float clearance issues." into klp-docs 2014-05-29 22:33:24 +00:00
Wink Saville
5d3c96168d am 52b41462: am 9cd3ff7d: Merge "Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change." 
* commit '52b4146273ea29f6d1ed89e4de79f2d7ff0d71dc':
  Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change.
 2014-05-29 09:56:24 +00:00
Griff Hazen
cc212d35aa am 339f437d: Additional doc fixes for WearableExtender 
* commit '339f437dc3f7c474d9cf1f963819bab2596e6ad3':
  Additional doc fixes for WearableExtender
 2014-05-29 06:34:01 +00:00
Wink Saville
52b4146273 am 9cd3ff7d: Merge "Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change." 
* commit '9cd3ff7d61ed65e8b815155747e7bbfc99c1e861':
  Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change.
 2014-05-29 04:57:25 +00:00
Wink Saville
9cd3ff7d61 Merge "Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change." 2014-05-29 04:53:52 +00:00
Zhang Wei-e7976c
fb61bfa447 Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change. 
Change-Id: Ibe9e68295661f2f2ffaca3057d696df6a1db3f0c
 2014-05-29 04:43:19 +00:00
Brian Carlstrom
77b170cedc resolved conflicts for merge of 452c5921 to klp-modular-dev-plus-aosp 
Change-Id: I6044604b431eed0319579a1a3b9213c9a0aaf678
 2014-05-28 16:10:53 -07:00