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

139207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
fb40dd4d00 Merge kwd to master 
Add initial IMS and MSIM support from klp-wireless-dev-mirror

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
 2014-06-13 13:30:57 +00:00
Przemyslaw Szczepaniak
6dfa6e2a9b Fix typo and broken sdk build. 
Change-Id: Icd1641955d1ca88396219db05312a4a9fd77ea80
 2014-06-13 13:43:26 +01:00
Przemyslaw Szczepaniak
e31ab2d8fc Merge "Expose "default tts locale" to the TTS V2 API." 2014-06-11 15:57:38 +00:00
Przemyslaw Szczepaniak
1b5637ee32 Expose "default tts locale" to the TTS V2 API. 
This change allows TTS V2 API client applications to honor the
"default TTS locale" set by the user in the TTS settings.

Note that the TTS V1 API uses 3 character country/language codes
for locale encoding. It's the only system component that does
that. TTS V2 uses the standard, valid Locale objects. The default
TTS locale setting was stored as a 3 character locale string with
"-" as the separator.

This change switches the TTS locale setting format to the output of
Locale.toString() call (on a valid Locale object). Methods used for
reading this value can interpret both forms and try to return a valid
Locale object as an output.

Change-Id: Ice2e6c25a43eb9dd6e17d371ee582c2dae3329c9
 2014-06-11 13:49:48 +01:00
Ji-Hwan Lee
53a1eaa771 Merge "LayoutLib: Fix broken sdk builds" 2014-06-10 22:36:02 +00:00
Ji-Hwan Lee
a3874f0ac6 LayoutLib: Fix broken sdk builds 
Change-Id: I301b312195eb3e57cb581d015e7c0b0492084b3e
 2014-06-13 20:34:54 +09:00
Lorenzo Colitti
7ec99f0294 Merge "Assert that RT_SCOPE_* and IFA_F_* are not zero." 2014-06-10 22:36:02 +00:00
Jeff Brown
2bcf05e5e9 am cd4c754e: am 374013f4: Merge "Suppress haptic feedback for SLEEP key when already asleep." into klp-modular-dev 
* commit 'cd4c754e9917f3ad292e20a89f1f7d03f344a3cf':
  Suppress haptic feedback for SLEEP key when already asleep.
 2014-06-13 10:24:36 +00:00
Jeff Brown
49f186a295 am 1a073a8f: am 926e1f01: Merge "When watch is docked, home key press should launch dock home." into klp-modular-dev 
* commit '1a073a8f550695342e8e3902d2223fd237941e95':
  When watch is docked, home key press should launch dock home.
 2014-06-13 10:24:29 +00:00
Lorenzo Colitti
62388936c8 Assert that RT_SCOPE_* and IFA_F_* are not zero. 
If these constants are zero (or, rather, if they're not all
different), the test will fail with more cryptic error messages
whose cause is not obvious. Clearly check for that here.

Bug: 15602893
Change-Id: I7ca4a9c5e3d592fd93fbfa1b50666a1861a0031d
 2014-06-13 17:20:20 +09:00
Jinsuk Kim
63dd3bb360 Fixed a wrong path to HdmiPortInfo class 
This fixes a JNI error for HdmiCecController

Change-Id: I8ce987dfa3126ecffd455a964c01d27fb9aa01eb
 2014-06-13 14:46:17 +09: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
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
vandwalle
3801202284 Merge "auto-roam fixes, disable scanning based on traffic at interface" 2014-06-12 05:34:42 +00:00
vandwalle
72d87d99b0 auto-roam fixes, disable scanning based on traffic at interface 
Bug: 15575229
Bug: 15577651

Change-Id: Ia8914a90d803fd9e6ba9fa51efce50c7b7f1c692
 2014-06-13 03:32:28 +00:00
Adam Powell
90132dd7ca am c72a2a82: Merge "Explicitly track consumed state for WindowInsets" into lmp-preview-dev 
* commit 'c72a2a82160099e8f20c42eb0d36881c31537130':
  Explicitly track consumed state for WindowInsets
 2014-06-12 18:37:33 +00:00
Christopher Tate
93e9e7208e am ba6e8ae5: Merge "Relax duplicate-permission-definition constraints slightly" into lmp-preview-dev 
* commit 'ba6e8ae5d2a364799fd6bc84179e33b6731e574b':
  Relax duplicate-permission-definition constraints slightly
 2014-06-12 18:37:28 +00:00
Winson Chung
02a9c359a1 am e202fff5: Merge "Stop sending broadcasts to RecentsActivity before boot has completed. (Bug 15109101)" into lmp-preview-dev 
* commit 'e202fff5f77568294ba4b50c879ca587535db3be':
  Stop sending broadcasts to RecentsActivity before boot has completed. (Bug 15109101)
 2014-06-12 18:08:09 +00:00
Fabrice Di Meglio
0044b20eb7 am 52771816: Merge "Fix Material Preference Framework layout" into lmp-preview-dev 
* commit '527718164cbb28dff6be6073ba78515395bcf9e1':
  Fix Material Preference Framework layout
 2014-06-12 18:08:04 +00:00
Raph Levien
12871e99d0 am 0e8a57cc: Merge "Support fake italics" into lmp-preview-dev 
* commit '0e8a57cc1ff4d12791231177b679114b05279548':
  Support fake italics
 2014-06-12 17:56:00 +00:00
Raph Levien
63fa80eaab am 7a5662e8: (-s ours) Merge "Support for fake bold in Minikin builds" into lmp-preview-dev 
* commit '7a5662e807f0e99bd8499a52ffed9d114d299f80':
  Support for fake bold in Minikin builds
 2014-06-12 17:55:54 +00:00
Raph Levien
c9f705b8f9 am 7204116b: (-s ours) Merge "Fix getFontMetrics problems" into lmp-preview-dev 
* commit '7204116b97bd5e1f79113566577c89c4d0925255':
  Fix getFontMetrics problems
 2014-06-12 17:49:23 +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
John Reck
816f71b7e0 Merge "Move LayerType to RenderNode" 2014-06-12 05:34:42 +00:00
John Reck
25fbb3fa11 Move LayerType to RenderNode 
Change-Id: Icb79a5015cb0362b1f3a66d09007450730135a97
 2014-06-12 19:25:33 -07:00
John Reck
a447d29c65 Fix DA bugs 
* Now aware of transform of DrawDisplayListOp
 * Supports projection

 Bug: 15539677
 Bug: 15506680

Change-Id: Ic16f482cd48c3add12e49eca529281be12b93491
 2014-06-12 09:13:45 -07: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