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

139254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ido Ofir
7bb38dbb3c Merge "Adding permission for launching the trust agent settings." 2014-06-12 05:34:42 +00:00
Ido Ofir
29372ab484 Adding permission for launching the trust agent settings. 
Change-Id: Iac5bde57ca8d465fdf0fa5848d6716fc88801aeb
 2014-06-13 14:52:19 -07:00
Andrew Solovay
a0f0c783d0 am 79130d1d: am 81be9239: am bd8ca9f9: am 4737af8b: docs: Added "Verifying for ART" to TOC. 
* commit '79130d1de32380f346a95d277dc8403b37ad97b9':
  docs: Added "Verifying for ART" to TOC.
 2014-06-13 21:50:33 +00:00
Qiwen Zhao
677d4ae6ea Merge "Merge commit '0f3d3dd2'" 2014-06-13 21:09:46 +00:00
Qiwen Zhao
220cad6d97 Merge commit '0f3d3dd2' 
Conflicts:
	services/core/java/com/android/server/am/ActivityStack.java
	services/core/java/com/android/server/am/ActivityStackSupervisor.java
 2014-06-13 14:43:51 -07:00
Zhijun He
0cb41fd5ad Merge "Camera2: Add rollingShutterSkew tag" 2014-06-13 21:09:46 +00:00
Zhijun He
0bda31afe0 Camera2: Add rollingShutterSkew tag 
Change-Id: Icbedaeda9fc64a9dda509493ad9d14569c56cd18
 2014-06-13 14:38:39 -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
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
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
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
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
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
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
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
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
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
Dirk Dougherty
866ad0c2b2 am 460cab19: am b024fd20: am bdcd6fc7: Doc change: Update monetization docs. 
* commit '460cab199df38b16ea1a4fc9e4f62509049cc859':
  Doc change: Update monetization docs.
 2014-06-12 02:44:11 +00:00
Dirk Dougherty
460cab199d am b024fd20: am bdcd6fc7: Doc change: Update monetization docs. 
* commit 'b024fd208720b9d0e5fd5cd4c7fb09c19b1a86ad':
  Doc change: Update monetization docs.
 2014-06-12 02:41:07 +00:00
Dirk Dougherty
b024fd2087 am bdcd6fc7: Doc change: Update monetization docs. 
* commit 'bdcd6fc777e678fb3d0d9b7f000b43d703fea9cd':
  Doc change: Update monetization docs.
 2014-06-12 02:37:27 +00:00
Dirk Dougherty
bdcd6fc777 Doc change: Update monetization docs. 
Change-Id: Ic34c1a08f8b7bcd271ad53f31c62d0bab82fc053
 2014-06-11 17:52:07 -07:00
Elliott Hughes
b952587184 am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art interface." 
* commit '8525fe8d0a5a886704307055ef211fc911997783':
  Switch to a type-safe album art interface.
 2014-06-12 00:06:20 +00:00
Elliott Hughes
8525fe8d0a am 1a3908e9: Merge "Switch to a type-safe album art interface." 
* commit '1a3908e95926acd8add3858be571fe23fa9d047a':
  Switch to a type-safe album art interface.
 2014-06-12 00:02:42 +00:00
Craig Mautner
f5030ecbca am 4a9f1298: Close ActivityView and ActivityContainer cleanly. 
* commit '4a9f129874785d34930f165268dbc618e4bc2618':
  Close ActivityView and ActivityContainer cleanly.
 2014-06-12 00:00:17 +00:00
Craig Mautner
4a9f129874 Close ActivityView and ActivityContainer cleanly. 
- Do not call IActivityContainer.release() from
ActivityView.finalize() if it has already been called from
ActivityView.release(). Eliminates IBinder finalized Exception.

- Call ActivityRecord.makeFinishing() before calling ActivityStack.
destroyActivityLocked(). Forces call to scheduleDestroyActivity()
and eventually removeFromHistory(). Otherwise removeFromHistory()
is never called and window manager AppWindowTokens become orphans.

- Defer call to ActivityContainer.detachLocked() until all
activities have finished or timed out. Fixes problem where Display
is removed while activities are still launching.

- Call ActivityStackSupervisor.deleteActivityContainer() when all
activities have finished or timed out. Fixes orphaned
ActivityContainers.

Fixes bug 15450798.
Fixes bug 15484154.
Fixes bug 15383479.
Fixes bug 15316558.
Fixes bug 15168560.
Fixes bug 15143914.

Change-Id: Id3c641976b6f825458690f9ee063c07818b56f23
 2014-06-11 16:33:00 -07:00
Scott Main
55c11af78a 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 2014-06-11 21:23:31 +00:00