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

139590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smain@google.com
78219f0466 update download pages for SDK and remove /tools landing page. 
Change-Id: I7e883a2647d7c487570c4abdba9df5d72a52b274
 2014-06-13 13:26:43 -07:00
Andrew Solovay
79130d1de3 am 81be9239: am bd8ca9f9: am 4737af8b: docs: Added "Verifying for ART" to TOC. 
* commit '81be9239fd9bf4122757a23e143c0aa1b925b42b':
  docs: Added "Verifying for ART" to TOC.
 2014-06-13 18:29:36 +00:00
Andrew Solovay
81be9239fd am bd8ca9f9: am 4737af8b: docs: Added "Verifying for ART" to TOC. 
* commit 'bd8ca9f9adf10a5b7e1e04ed139e4108758e286f':
  docs: Added "Verifying for ART" to TOC.
 2014-06-13 18:25:53 +00:00
Andrew Solovay
bd8ca9f9ad am 4737af8b: docs: Added "Verifying for ART" to TOC. 
* commit '4737af8b0aa77681270b6bc6478a946b71144e45':
  docs: Added "Verifying for ART" to TOC.
 2014-06-13 18:23:03 +00:00
Andrew Solovay
4737af8b0a docs: Added "Verifying for ART" to TOC. 
Now that "Verifying App Behavior on the Android Runtime (ART)"
(guide/practices/verifying-apps-art.jd) is published, also adding it
to the "API Guides" TOC.

You can verify it at

http://asolovay.mtv:9001/guide/practices/index.html

(...it's the last element in the "Best Practices" submenu.)

Change-Id: If7b445616768d17193309dbd3075b2630652ac96
 2014-06-13 10:52:29 -07:00
Justin Koh
0f3d3dd26c am dd5c9471: Revert "Close ActivityView and ActivityContainer cleanly." 
* commit 'dd5c94717077c9366dee364c88a86a78e5ee2688':
  Revert "Close ActivityView and ActivityContainer cleanly."
 2014-06-13 17:27:48 +00:00
Justin Koh
dd5c947170 Revert "Close ActivityView and ActivityContainer cleanly." 
This reverts commit 4a9f129874785d34930f165268dbc618e4bc2618.

Conflicts:
	services/core/java/com/android/server/am/ActivityStackSupervisor.java

Change-Id: Ic1f4df7f4cb644de7ddebcdc8ce632b46c5ba8f2
 2014-06-13 09:55:09 -07:00
Digish Pandya
1fa4cef34a hwui: fix possible null pointer de-refrence 
add layer check for  null before de-refrencing it.

issue link: http://code.google.com/p/android/issues/detail?id=61622

Change-Id: I54fc21ec594effcfb1eededd80dd5b0b52645c4c
 2014-06-13 17:14:50 +05:30
Jeff Brown
cd4c754e99 am 374013f4: Merge "Suppress haptic feedback for SLEEP key when already asleep." into klp-modular-dev 
* commit '374013f4dba56c9ea340d22dcefdf904cbd47ce6':
  Suppress haptic feedback for SLEEP key when already asleep.
 2014-06-13 03:08:35 +00:00
Jeff Brown
1a073a8f55 am 926e1f01: Merge "When watch is docked, home key press should launch dock home." into klp-modular-dev 
* commit '926e1f01a5f2366c5d0eeab358822ba1d138d980':
  When watch is docked, home key press should launch dock home.
 2014-06-13 03:04:25 +00:00
Lu, Shenghua
c5e0a29541 update parameters in uploadToTexture() for GLES20 
Google optimized the uploadToTexture with GLES3.0+,
This allows us to upload a sub-rectangle of texture,
but this has compliance issue with GLES 2.0.

With OpenGL ES 2.0 we need to copy the bitmap in a
temporary buffer if the stride doesn't match the width,
and then upload entire temporary stripes.

Change-Id: I8987cd8347913c61b7fa45bd47be1189aa6bdb05
Signed-off-by: Shenghua Lu <shenghua.lu@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Guobin Zhang<guobin.zhang@intel.com>
 2014-06-13 09:42:33 +08:00
Craig Mautner
4849aa86b1 am be634951: Fix permission problem and NPE 
* commit 'be63495101dba3b0c3c496cdd810df9e30e926d4':
  Fix permission problem and NPE
 2014-06-12 23:36:54 +00:00
Tim Murray
604ea0e415 am b1c9430c: am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit." 
* commit 'b1c9430c8749b1feba59bb55a31cb1364270981b':
  Move FieldPacker over to use large objects on 64-bit.
 2014-06-12 23:08:39 +00:00
Tim Murray
b1c9430c87 am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit." 
* commit '77d28ca25378530f92d409fbd72a38a1e256b59f':
  Move FieldPacker over to use large objects on 64-bit.
 2014-06-12 23:05:16 +00:00
Nick Kralevich
50ece5ec53 am 9a0485aa: am 1ef888e5: Merge "Add service_contexts to policy update bundles." 
* commit '9a0485aa567c99157e45d08e9712a281f34ffc5f':
  Add service_contexts to policy update bundles.
 2014-06-12 21:10:30 +00:00
Jeff Brown
374013f4db Merge "Suppress haptic feedback for SLEEP key when already asleep." into klp-modular-dev 2014-06-12 21:07:47 +00:00
Jeff Brown
bae8e77db6 Suppress haptic feedback for SLEEP key when already asleep. 
Bug: 15377857
Change-Id: I4dfd273b089871d3a78513f52436a3f9c7d40fa4
 2014-06-12 19:59:45 -07:00
Jeff Brown
4f5fa285a8 When watch is docked, home key press should launch dock home. 
Bug: 15575717
Change-Id: Ib3fbe3ed0380378b0162901bfeebe3c218c4d568
 2014-06-12 19:19:15 -07:00
Nick Kralevich
9a0485aa56 am 1ef888e5: Merge "Add service_contexts to policy update bundles." 
* commit '1ef888e564926b78aeb02ef1085be2f72227b862':
  Add service_contexts to policy update bundles.
 2014-06-12 21:07:25 +00:00
Craig Mautner
be63495101 Fix permission problem and NPE 
Remove uid before calling into Window Manager. Restore afterwards.

Check for null stack value before dereferencing.

Fixes bug 15591112.

Change-Id: Ida3de556940440162c91b8c1614d0f21e364abd8
 2014-06-12 13:50:53 -07:00
Marco Nelissen
48163e060d Don't send unneeded messages. 
This is significantly faster, and doesn't caused messages to pile
up on a looper that might not be processing them.

Change-Id: I2d3536d1f12c71a214c181523dcd60810de3029d
 2014-06-12 13:22:16 -07:00
Deepanshu Gupta
1434ea749f am 92b7c67e: Merge "LayoutLib fixes for API 20 [DO NOT MERGE]" into klp-modular-dev 
* commit '92b7c67e719fa125a5af368eb9e00f724c88601d':
  LayoutLib fixes for API 20 [DO NOT MERGE]
 2014-06-12 20:04:12 +00:00
Scott Main
91b078c8dc am 55c11af7: Merge "reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter." into klp-modular-dev 
* commit '55c11af78a34f6746b9b5fcf8aa487eef797ea2e':
  reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter.
 2014-06-12 19:04:34 +00:00
Andrew Solovay
d51a5b3891 am 25b8af9d: am 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs 
* commit '25b8af9d3f91503146a4592d7fc19a53ca44bf4a':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
 2014-06-12 17:27:48 +00:00
Andrew Solovay
25b8af9d3f am 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs 
* commit '436f4e36d30bc6d1f2b353d8e5de9c37a594e874':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
 2014-06-12 17:23:31 +00:00
Andrew Solovay
436f4e36d3 am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs 
* commit 'ded9c171ead51b358538a65d8b84946e05d8db2b':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
 2014-06-12 17:19:33 +00:00
Chris Wren
20d3ba200a Merge "Fix notification update path for structural updates." into lmp-preview-dev 2014-06-12 17:09:07 +00:00
Chris Wren
1dafd04247 Fix notification update path for structural updates. 
Similar logic is required for the replacement case, as is already in place
for the update case, although the actions are different.

Bug: 15588056
Change-Id: I9ad115237c589716772e569fa1979a206b77097b
 2014-06-12 13:51:51 -04:00
Ihab Awad
879d8b3308 Merge "DO NOT MERGE. Port "respond via SMS message" feature to new Telecomm. (1/4)" into lmp-preview-dev 2014-06-12 17:09:07 +00:00
Selim Gurun
4473427f85 Merge "Address the API review" into lmp-preview-dev 2014-06-12 05:34:42 +00:00
Selim Gurun
ee89ab4dd5 Address the API review 
Bug: 15432556

The api council asks to change the interface to an abstract class
and clarify the clearClientCertPreferences api. This change addresses
these.

Change-Id: I7979788c7c041bacbfef5ea4d94309f91279ef22
 2014-06-13 10:53:55 -07:00
Winson Chung
47f166dd8c Fixing issue where we do not get the task rects, and therefore have no transitions. (Bug 15610655) 
Change-Id: Ie25f0037a4f8bf8c3069d50e3a0ad670125be9a1
 2014-06-13 16:01:05 +00:00
Baligh Uddin
e31d9438db Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-12 21:07:47 +00:00
Baligh Uddin
0ce9237391 Import translations. DO NOT MERGE 
Change-Id: Ic15fd186de8247f8a5cad5cce87218ebec6cd81e
Auto-generated-cl: translation import
 2014-06-13 07:23:57 -07:00
Baligh Uddin
da8a64b80b Import translations. DO NOT MERGE 
Change-Id: Ibdd11bf4b5a0ebb0394400688dd0e38a70660a62
Auto-generated-cl: translation import
 2014-06-13 07:20:46 -07:00
Sol Boucher
b8cee5175d camera2: Remove stray </p> in CameraDevice#createCaptureSession 
This was causing strange indentation.
The change also clarifies how to get the supported output sizes in the
ImageReader flow: Although the doc (correctly) instructed the developer to use
StreamConfigurationMap#getOutputSizes(int) with an ImageReader, this instruction
appeared after the bulleted list of output types. Since all other items in that
list specify that getOutputSizes(Class<?>) should be used, the reader shouldn't
be expected to read beyond the list only in this specific case.

Bug: 15574400
Change-Id: Id952b46ae52322d75abbcaffea678d5ba50b22a5
 2014-06-12 17:39:11 +00:00
Eino-Ville Talvala
fb587f4f6b Merge "camera2 docs: Fix instructions for using SurfaceView." into lmp-preview-dev 2014-06-12 17:09:07 +00:00
Eino-Ville Talvala
5ae1ca5b69 camera2 docs: Fix instructions for using SurfaceView. 
Bug: 15597178
Change-Id: I802369e61725451ddd8df855c384608c80e12693
 2014-06-12 17:02:17 -07:00
Jeff Brown
926e1f01a5 Merge "When watch is docked, home key press should launch dock home." into klp-modular-dev 2014-06-12 05:34:42 +00:00
Tim Murray
77d28ca253 Merge "Move FieldPacker over to use large objects on 64-bit." 2014-06-12 05:34:11 +00:00
Tim Murray
4154bbd69b Move FieldPacker over to use large objects on 64-bit. 
Change-Id: I1d4d502a3f9d86c6cf0f516cc087b1457f86ac28
 2014-06-12 14:23:19 -07:00
Nick Kralevich
1ef888e564 Merge "Add service_contexts to policy update bundles." 2014-06-12 03:32:07 +00:00
Riley Spahn
5f5cf5f670 Add service_contexts to policy update bundles. 
Add service_context file to SELinuxPolicyInstallReceiver
to allow updating.

Bug: 12909011
Change-Id: Ic0ad89958cc750413787d57e0f51363212a8730b
 2014-06-12 20:46:34 +00:00
Baligh Uddin
a14185bba6 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-12 03:30:50 +00:00
Baligh Uddin
72822c345f Import translations. DO NOT MERGE 
Change-Id: Ia6b6c5883d9ea2b9ce986bfa868d68bae034d36a
Auto-generated-cl: translation import
 2014-06-13 11:22:10 -07:00
Robert Ly
d73b045090 Merge "docs: fix index pages" into klp-modular-dev 2014-06-12 03:30:50 +00:00
Robert Ly
1568c19fe3 docs: fix index pages 
Change-Id: I2a011ee5a3539d908d10ac5dbc9c0df3e7633220
 2014-06-15 18:40:06 -07:00
Robert Ly
09e2459cc3 Merge "docs: Added info on customizing the status bar." into klp-modular-dev 2014-06-12 03:30:50 +00:00
Ricardo Cervera
239d09276b docs: Added info on customizing the status bar. 
Change-Id: I345fc253057e2abe8284ef4b1f5f3744081424bf
 2014-06-15 15:32:30 -07:00
Robert Greenwalt
a83ce3451d Merge "Apply API Council comments to ConnectivityManager" into lmp-preview-dev 2014-06-12 03:30:50 +00:00