Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131,542 Commits 3 Branches 0 Tags
ca463a226661ba4ab4c4bf0d4ed25f2107e2db86
Commit Graph

131542 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Salyzyn
ca463a2266 am c726f6b5: am b90e504e: am 649da9b5: am 5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH" 
* commit 'c726f6b537c5913600bc35ff866f1fb32800b9be':
  Native Runtime: Add LOG_ID_CRASH
 2014-04-18 18:13:35 +00:00
Mark Salyzyn
c726f6b537 am b90e504e: am 649da9b5: am 5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH" 
* commit 'b90e504ec17a7f509521c21f2b937a2ebefaf6ab':
  Native Runtime: Add LOG_ID_CRASH
 2014-04-18 16:25:59 +00:00
Mark Salyzyn
b90e504ec1 am 649da9b5: am 5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH" 
* commit '649da9b505498ff87d75da56d376d46c22e50782':
  Native Runtime: Add LOG_ID_CRASH
 2014-04-18 15:08:56 +00:00
Mark Salyzyn
649da9b505 am 5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH" 
* commit '5a47a9f62dd9bcb6573555b7a3ef4b1f5e485fc4':
  Native Runtime: Add LOG_ID_CRASH
 2014-04-18 15:02:48 +00:00
Mark Salyzyn
5a47a9f62d Merge "Native Runtime: Add LOG_ID_CRASH" 2014-04-18 14:55:32 +00:00
Selim Gurun
292601f96f am 14cd25f6: Merge "Provide an API to set print document name." 
* commit '14cd25f619fe981455aec9c79dc1abd89f4f5d8c':
  Provide an API to set print document name.
 2014-04-18 14:53:41 +00:00
Selim Gurun
14cd25f619 Merge "Provide an API to set print document name." 2014-04-18 14:49:25 +00:00
John Reck
82da9ecae7 am f29e2640: Merge "Force a full redraw on surface change" 
* commit 'f29e264049cc64dbb3b0e1146b81b9b476660282':
  Force a full redraw on surface change
 2014-04-18 03:37:14 +00:00
John Reck
f29e264049 Merge "Force a full redraw on surface change" 2014-04-18 03:34:44 +00:00
John Reck
dbc9a86d05 Force a full redraw on surface change 
Bug: 13913604

Change-Id: Ie90c7ee74cf83358e19d8b4f0bae078540a93a8d
 2014-04-17 20:27:37 -07:00
Ricardo Cervera
c50a14e91a am 92f4a346: am fa711a33: am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 
* commit '92f4a3465ea2521523b5659f8006097e07a9be58':
  docs: Added the play from search intent. Bug: 13473141.
 2014-04-18 02:07:44 +00:00
Ricardo Cervera
92f4a3465e am fa711a33: am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 
* commit 'fa711a33be265d1fcd08efd850085615ec66dd89':
  docs: Added the play from search intent. Bug: 13473141.
 2014-04-18 02:03:14 +00:00
Ricardo Cervera
fa711a33be am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 
* commit 'd09e1bffe412ace61a411873cc8d0a3759540e46':
  docs: Added the play from search intent. Bug: 13473141.
 2014-04-18 01:59:03 +00:00
Ricardo Cervera
d09e1bffe4 am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 
* commit 'ed5b8c06bbc70facbe553a9ca257a277ac3758ca':
  docs: Added the play from search intent. Bug: 13473141.
 2014-04-18 01:54:31 +00:00
Ricardo Cervera
ed5b8c06bb am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 
* commit '6aeea4549787ec282d2ca42b8495b87645958fc9':
  docs: Added the play from search intent. Bug: 13473141.
 2014-04-18 01:49:50 +00:00
Ricardo Cervera
6aeea45497 Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 2014-04-18 01:46:25 +00:00
Michael Kolb
99111b9319 am d3602290: am 7d755a6f: Merge branch \'klp-modular-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev-plus-aosp 
* commit 'd36022901e39c49c976f863d1cad696514c6f193':
  jni: binder ptrdiff_t compile issues
 2014-04-18 01:17:41 +00:00
Michael Kolb
dfbcf0ca33 am f4399e72: resolved conflict for merge from d42eeab2 to master 
* commit 'f4399e7243c35bef3eabfd20582246818a0bbbd3':
  Populate isRound from config.xml to WindowInsets
 2014-04-18 01:17:38 +00:00
Michael Kolb
d36022901e am 7d755a6f: Merge branch \'klp-modular-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev-plus-aosp 
* commit '7d755a6f572dfcbe644bf3d92240cc45f8bf7dcc':
  jni: binder ptrdiff_t compile issues
 2014-04-18 01:13:29 +00:00
Michael Kolb
f4399e7243 resolved conflict for merge from d42eeab2 to master 
Change-Id: I41bd238f0628110c923b79259de4cd11a783340c
 2014-04-17 18:00:40 -07:00
Selim Cinek
8d19d37938 am 47391720: Merge "ViewGroup now applies clipBounds to its children" 
* commit '473917208961a90ca76fa9b9341b95902859b682':
  ViewGroup now applies clipBounds to its children
 2014-04-18 00:49:39 +00:00
Michael Kolb
7d755a6f57 Merge branch 'klp-modular-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev-plus-aosp 2014-04-18 00:48:20 +00:00
Michael Kolb
d42eeab20f am 4abbd0a6: Merge "Populate isRound from config.xml to WindowInsets" into klp-modular-dev 
* commit '4abbd0a685cb418eb3cfc1f030d3091ef394a7e3':
  Populate isRound from config.xml to WindowInsets
 2014-04-18 00:48:13 +00:00
Mark Salyzyn
c5aa56872d am 7423510c: am da93c60d: Merge "jni: binder ptrdiff_t compile issues" 
* commit '7423510c5a6a103a77efc36f064ed716f8810b97':
  jni: binder ptrdiff_t compile issues
 2014-04-18 00:47:47 +00:00
Michael Kolb
4abbd0a685 Merge "Populate isRound from config.xml to WindowInsets" into klp-modular-dev 2014-04-18 00:44:35 +00:00
Mark Salyzyn
7423510c5a am da93c60d: Merge "jni: binder ptrdiff_t compile issues" 
* commit 'da93c60d8a5b79f90d44408d992fb532eaaf8fa7':
  jni: binder ptrdiff_t compile issues
 2014-04-18 00:43:36 +00:00
Selim Cinek
4739172089 Merge "ViewGroup now applies clipBounds to its children" 2014-04-18 00:41:21 +00:00
Mark Salyzyn
da93c60d8a Merge "jni: binder ptrdiff_t compile issues" 2014-04-18 00:40:01 +00:00
Michael Kolb
6642e51ac5 Populate isRound from config.xml to WindowInsets 
Change-Id: I41b3aef1322a7cdccdcbc679eb753e0a1e561fad
 2014-04-17 17:32:50 -07:00
Mark Salyzyn
5b6da1aee8 jni: binder ptrdiff_t compile issues 
Change-Id: Ibdd82479d3f9fb53cf1d6793c4f7353e8f1c3646
 2014-04-17 17:25:36 -07:00
John Spurlock
8da7075c82 am cbdf956b: Merge "Revert "Fix broken status bar when activity is showing above keyguard"" 
* commit 'cbdf956b42fe40edaa7bfd36e5e2f1c257be220c':
  Revert "Fix broken status bar when activity is showing above keyguard"
 2014-04-18 00:19:17 +00:00
John Spurlock
cbdf956b42 Merge "Revert "Fix broken status bar when activity is showing above keyguard"" 2014-04-18 00:13:56 +00:00
Christopher Tate
9d45c0c50b am 0153487d: Merge "Support per-package lib dirs for bundled apps" 
* commit '0153487d01e4921a7e3dc42c2fd68642622dd6f6':
  Support per-package lib dirs for bundled apps
 2014-04-18 00:09:10 +00:00
Jianing Wei
a698d4e00a am abb7a886: Merge "Camera2 API: fix wrong logic in handling last frame number." 
* commit 'abb7a886970448bbaeb8abe7cd877eab48809a60':
  Camera2 API: fix wrong logic in handling last frame number.
 2014-04-18 00:09:05 +00:00
Christopher Tate
0153487d01 Merge "Support per-package lib dirs for bundled apps" 2014-04-18 00:02:44 +00:00
Jianing Wei
abb7a88697 Merge "Camera2 API: fix wrong logic in handling last frame number." 2014-04-18 00:00:12 +00:00
Christopher Tate
addfbdc09c Support per-package lib dirs for bundled apps 
Bundled apps can now use /system/lib/apkname or /system/lib64/apkname
in addition to the (globally shared) /system/lib and /system/lib64
directories.  Note that when an app is updated post hoc the update APK
will look to its normal library install directory in
/data/data/[packagename]/lib, so such updates must include *all*
needed libraries -- the private /system/lib/apkname dir will not be in
the path following such an update.

"apkname" here is the base name of the physical APK that holds the
package's code.  For example, if a 32-bit package is resident on disk
as /system/priv-app/SettingsProvider.apk then its app-specific lib
directory will be /system/lib/SettingsProvider

Bug 13170859

Change-Id: Ic44cc75312f33d2f5d402a1c261b2eca3fe8badc
 2014-04-17 16:54:16 -07:00
John Spurlock
2e50f28f41 Revert "Fix broken status bar when activity is showing above keyguard" 
This reverts commit 25ab3d9438.

Change-Id: I7dba397a9fe09d70b87ff4e638805c010c192599
 2014-04-17 23:45:50 +00:00
Mark Salyzyn
57e68bfc30 am 8a611400: am dc500d2d: am 4037847c: am 73258630: Merge "jni: binder 64-bit compile issues" 
* commit '8a61140034a2007d6d3b8ca7a7d87f6d87866dd7':
  jni: binder 64-bit compile issues
 2014-04-17 23:45:30 +00:00
Stephen Hines
69f316d6bf am 9deecdc8: am fc45b664: am f0aa4cc0: am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written." 
* commit '9deecdc88f77d8a4a8ff25c1ef2405b42a05ce81':
  Fix improper use of JNI_ABORT for operations where Java objects are written.
 2014-04-17 23:45:26 +00:00
Mindy Pereira
43198a6c09 am cbc7168e: am 03f7f442: am cb54f978: Merge "Update window alpha at the same time as translating" into klp-modular-dev 
* commit 'cbc7168e55fd4058647af5a6ca7652bb99b299b0':
  Update window alpha at the same time as translating
 2014-04-17 23:45:22 +00:00
Vinit Deshapnde
3a1ee8e450 am 0d870c11: am 734ccfbc: (-s ours) am 2585e15e: am 72358802: am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev 
* commit '0d870c11e55dd52b6fc5e2071af5b32877ecbd2b':
  Don't reset country code once it is persisted
 2014-04-17 23:34:38 +00:00
Mark Salyzyn
8a61140034 am dc500d2d: am 4037847c: am 73258630: Merge "jni: binder 64-bit compile issues" 
* commit 'dc500d2d567b37c620308bc8f0b0928eba4a2f5b':
  jni: binder 64-bit compile issues
 2014-04-17 23:33:58 +00:00
Stephen Hines
9deecdc88f am fc45b664: am f0aa4cc0: am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written." 
* commit 'fc45b664d421553042629d24086a144761c7b5e1':
  Fix improper use of JNI_ABORT for operations where Java objects are written.
 2014-04-17 23:33:54 +00:00
Mindy Pereira
cbc7168e55 am 03f7f442: am cb54f978: Merge "Update window alpha at the same time as translating" into klp-modular-dev 
* commit '03f7f44250faea2db0147f43b6699436e540889d':
  Update window alpha at the same time as translating
 2014-04-17 23:33:33 +00:00
Mark Salyzyn
dc500d2d56 am 4037847c: am 73258630: Merge "jni: binder 64-bit compile issues" 
* commit '4037847c0251a15ea88012a8405d0688c8b1ac53':
  jni: binder 64-bit compile issues
 2014-04-17 23:22:34 +00:00
Stephen Hines
fc45b664d4 am f0aa4cc0: am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written." 
* commit 'f0aa4cc0f257448f76e9d90b97abf9682e930fbf':
  Fix improper use of JNI_ABORT for operations where Java objects are written.
 2014-04-17 23:22:09 +00:00
Vinit Deshapnde
0d870c11e5 am 734ccfbc: (-s ours) am 2585e15e: am 72358802: am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev 
* commit '734ccfbc7b29a136e09e6a2ae788673fbd52f3b4':
  Don't reset country code once it is persisted
 2014-04-17 23:21:25 +00:00
Jeff Brown
6d74bc462c am aaea4d3a: am 18a69b93: am 8e1e4006: Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev 
* commit 'aaea4d3a4822a380831084a779f52a8e767ce402':
  Add support for dynamically setting the virtual display surface.
 2014-04-17 23:06:00 +00:00
Simon Wilson
e18b21b26b am 3e2cb07d: am ef059b03: am 3c8bbe24: Check that mRemotePlayer is not null before use 
* commit '3e2cb07d5258ca82cf4bd0b2e1380b36f56100d8':
  Check that mRemotePlayer is not null before use
 2014-04-17 23:05:56 +00:00