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

100160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victoria Lease
b61fb10fe4 fix argument mismatches in Paint JNI 
Paint.getTextRunCursor() no longer has a "flags" argument on the Java
side. The native side, however, still had the argument, and was being
called with misaligned arguments, causing all manner of madcap fun.

Also, the version of Paint.getTextRunCursor() that took String as an
argument needed to lose the "flags" argument, as well, to prevent an
infinite loop in the CharSequence version of the function, which was
supposed to be calling the String version but was actually calling
itself.

Bug: 8201224
Change-Id: Iad0dabaf81185f29a082566cc64590f2ba9bc31c
 2013-02-14 15:58:46 -08:00
Robert Greenwalt
fd869887c3 Merge "Fix a permissions probem in ConnectivityManager" 2013-02-14 16:43:33 +00:00
Craig Mautner
f0b36c5590 Merge "Refactor setAppOpVisibility implementation." 2013-02-14 06:22:32 +00:00
Jason Sams
30d2f8d6e0 Merge "Convert live preview demo to IO_OUTPUT" 2013-02-14 02:45:40 +00:00
Jeff Sharkey
7e72a693cf Merge "Remove sscanf() warnings when parsing stats." 2013-02-14 02:14:17 +00:00
Jeff Sharkey
9de56d220e Remove sscanf() warnings when parsing stats. 
Change-Id: I15b7ba93d7ec121f9a7e19926f7436f2117b3b1a
 2013-02-13 18:13:01 -08:00
Jeff Sharkey
aec6bcfb76 Merge "Parse network stats using native code." 2013-02-14 02:12:31 +00:00
Daniel Sandler
2977a30ef4 Merge "More debug logs for stuck statusbars." 2013-02-14 01:49:59 +00:00
Daniel Sandler
37a38aaecb More debug logs for stuck statusbars. 
Bug: 7686690
Change-Id: Ic58d90a56412579cad0c77f5787a6fc4193a32d1
 2013-02-13 20:47:48 -05:00
Jeff Sharkey
9a2c2a6da9 Parse network stats using native code. 
Switch to parsing detailed network stats with native code, which
is 71% faster than ProcFileReader.

Change-Id: I2525aaee74d227ce187ba3a74dd08a2b06514deb
 2013-02-13 17:40:49 -08:00
Fabrice Di Meglio
336fcac31d Merge "Fix bug #8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey" 2013-02-14 01:35:53 +00:00
Fabrice Di Meglio
ebcacc785b Fix bug #8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey 
- remove remaining dirFlags
- clean method names

Change-Id: I404b643cd10321e977530528168d1d415b3f2eca
 2013-02-13 17:22:52 -08:00
quddusc
66a4d9cd33 am 6b4d73c9: am cdcc2e58: am 68785da7: am 62bd2319: am 38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit '6b4d73c985996cf3fd1333edc073b5260c9d897e':
  docs: Updated In-app Billing docs to support subscriptions for V3.
 2013-02-13 17:19:31 -08:00
quddusc
6b4d73c985 am cdcc2e58: am 68785da7: am 62bd2319: am 38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'cdcc2e58e914793ff2ee475e5a4c7fd91a3d526b':
  docs: Updated In-app Billing docs to support subscriptions for V3.
 2013-02-13 17:17:07 -08:00
quddusc
cdcc2e58e9 am 68785da7: am 62bd2319: am 38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit '68785da7a052c75f73f3857ed97b74c3c03883c0':
  docs: Updated In-app Billing docs to support subscriptions for V3.
 2013-02-13 17:15:33 -08:00
quddusc
68785da7a0 am 62bd2319: am 38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit '62bd23190bdf559c6297ddcc991d18449c2e9d48':
  docs: Updated In-app Billing docs to support subscriptions for V3.
 2013-02-13 17:14:37 -08:00
quddusc
62bd23190b am 38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 
# Via Android (Google) Code Review (1) and quddusc (1)
* commit '38b6d7a15c6d5196f9b886f15dc58c28734300da':
  docs: Updated In-app Billing docs to support subscriptions for V3.
 2013-02-13 17:12:40 -08:00
Kenny Root
1247c0a11d am a276589b: am 37edbbc6: Merge "VpnDialogs: filter obscured touches" 
# Via Android Git Automerger (1) and others
* commit 'a276589ba5439e6b06a4f49de7420fbf45104c80':
  VpnDialogs: filter obscured touches
 2013-02-13 17:11:34 -08:00
quddusc
38b6d7a15c Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 2013-02-14 01:09:27 +00:00
Kenny Root
a276589ba5 am 37edbbc6: Merge "VpnDialogs: filter obscured touches" 
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '37edbbc62fa031c75ce5a1298fdd07d981907e89':
  VpnDialogs: filter obscured touches
 2013-02-13 17:09:22 -08:00
Michael Runge
044dca285f Merge "Add logging for kernel audit failures, including SELinux." 2013-02-14 00:52:31 +00:00
Kenny Root
37edbbc62f Merge "VpnDialogs: filter obscured touches" 2013-02-14 00:49:20 +00:00
quddusc
8dcc99dd82 docs: Updated In-app Billing docs to support subscriptions for V3. 
Change-Id: If56d563249c6836245e9d3dc2d0f7d709de0bd29
 2013-02-13 16:45:41 -08:00
Chris Craik
805a6fe7b1 Merge "Revert "Revert "Use RenderScript for large text blurs""" 2013-02-14 00:44:17 +00:00
Jean-Michel Trivi
4627a47d94 Merge "Remove obsolete imports" 2013-02-14 00:42:43 +00:00
Chris Craik
f2d8ccc15d Revert "Revert "Use RenderScript for large text blurs"" 
This reverts commit bf5703e52e3304246cbf0e73f6976f7d7312d238.

Change-Id: Ic6f991277dec9e80a6fed93db91499726b30ab2a
 2013-02-13 16:40:02 -08:00
Geremy Condra
51611eb728 Add logging for kernel audit failures, including SELinux. 
Bug: 7707280
Change-Id: I3788b465cb5733c93dbf36c91ce26e37d4be41c2
 2013-02-13 16:39:44 -08:00
Kenny Root
56480ef53f VpnDialogs: filter obscured touches 
Change-Id: Ifcc919c36006c88e36363f5160f9334df0cf7e5b
 2013-02-13 16:32:48 -08:00
Jason Sams
23496bdbba Convert live preview demo to IO_OUTPUT 
Change-Id: I01193932a6fcd572841434a59d34eda60d9b8b02

Fix aspect ratio
 2013-02-13 16:07:50 -08:00
Kenny Root
0c86885888 am fbed306f: am b0f4b8a7: Merge "Track keystore binder changes" 
# Via Android Git Automerger (1) and others
* commit 'fbed306fb9fe1a989a29c94d210e227ac07c2a03':
  Track keystore binder changes
 2013-02-13 16:02:07 -08:00
Kenny Root
3795f510d3 am 76e69417: am 8ab76778: Merge "KeyChain: return null instead of throw" 
# Via Android Git Automerger (1) and others
* commit '76e694172a16e346ff2ce783c3768176bd351319':
  KeyChain: return null instead of throw
 2013-02-13 16:02:04 -08:00
Kenny Root
fbed306fb9 am b0f4b8a7: Merge "Track keystore binder changes" 
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit 'b0f4b8a7d2662e8cc63dae1001175bf72bca1539':
  Track keystore binder changes
 2013-02-13 15:58:49 -08:00
Kenny Root
76e694172a am 8ab76778: Merge "KeyChain: return null instead of throw" 
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '8ab767786a3b59c72b613f84d40b181428327ac1':
  KeyChain: return null instead of throw
 2013-02-13 15:58:46 -08:00
Svetoslav
a7d72dfded Merge "Proper clean up when Ui test automation service is unregistered or dies." 2013-02-13 23:50:37 +00:00
Jason Sams
0a4b65e079 Merge "Reuse context and allocations across test." 2013-02-13 23:49:10 +00:00
Svetoslav
7379a95a0b Proper clean up when Ui test automation service is unregistered or dies. 
The UI test automation service was not removed from the list of
enabled and installed service where it was explicitly added on
registration. This was leaving the accessibility manager service
in an inconsistent state.

bug:8185435

Change-Id: Ice17cdef361fe98ce34f8dd01ec11dbad6c4d0c2
 2013-02-13 15:47:32 -08:00
Kenny Root
b0f4b8a7d2 Merge "Track keystore binder changes" 2013-02-13 23:43:57 +00:00
Kenny Root
8ab767786a Merge "KeyChain: return null instead of throw" 2013-02-13 23:39:05 +00:00
Joe Fernandez
4f76308544 am 9b0aa6c9: am 35390a79: am 7421aeab: am 6978d04b: am 9d95873d: Merge "docs: SDK r21.1 - fix download links, Issue 8193979" into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit '9b0aa6c906b22a91440ef5b980f6294c3dd42348':
  docs: SDK r21.1 - fix download links, Issue 8193979
 2013-02-13 15:36:05 -08:00
Joe Fernandez
9b0aa6c906 am 35390a79: am 7421aeab: am 6978d04b: am 9d95873d: Merge "docs: SDK r21.1 - fix download links, Issue 8193979" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '35390a7943b1a2826a95d6a2fe309089e04dd988':
  docs: SDK r21.1 - fix download links, Issue 8193979
 2013-02-13 15:33:39 -08:00
Joe Fernandez
35390a7943 am 7421aeab: am 6978d04b: am 9d95873d: Merge "docs: SDK r21.1 - fix download links, Issue 8193979" into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit '7421aeab5a63ba343ece937a8b4b712e15d76bdc':
  docs: SDK r21.1 - fix download links, Issue 8193979
 2013-02-13 15:31:19 -08:00
Joe Fernandez
7421aeab5a am 6978d04b: am 9d95873d: Merge "docs: SDK r21.1 - fix download links, Issue 8193979" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit '6978d04b444824dea6579e3352cf5cad7ffc7c6f':
  docs: SDK r21.1 - fix download links, Issue 8193979
 2013-02-13 15:29:08 -08:00
Joe Fernandez
6978d04b44 am 9d95873d: Merge "docs: SDK r21.1 - fix download links, Issue 8193979" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Joe Fernandez (1)
* commit '9d95873de1bdb024bcf50a51c5a6606a645f9d5d':
  docs: SDK r21.1 - fix download links, Issue 8193979
 2013-02-13 15:27:09 -08:00
Joe Fernandez
9d95873de1 Merge "docs: SDK r21.1 - fix download links, Issue 8193979" into jb-mr1-dev 2013-02-13 23:24:10 +00:00
Kenny Root
0150e48200 KeyChain: return null instead of throw 
The API documentation says it will return null if the key isn't found.
We get null back from the keystore daemon when it can't retrieve the
data, so just return null back to the API caller.

Change-Id: I42248bd50cbc5f76864bd762aae3faab1c50529d
 2013-02-13 15:24:06 -08:00
Craig Mautner
ee6e27c122 Merge "Stop using AppToken movement and start using Task." 2013-02-13 23:22:27 +00:00
Kenny Root
e151f281d5 Track keystore binder changes 
Change-Id: Id6133be059a8a0901d16355a9152e40e4a255454
 2013-02-13 15:22:25 -08:00
Scott Main
27b2b04f3c am f796c279: am e526eedb: am 1f6dbc0d: am c6608215: am d51a894a: docs: fix tools sidenav for offline docs 
# Via Android Git Automerger (4) and Scott Main (1)
* commit 'f796c2793388184e2642afd8e244762d48d54761':
  docs: fix tools sidenav for offline docs
 2013-02-13 15:19:17 -08:00
Stephen Hines
1f884ed206 Merge "Add tests for the new clipped kernel Java reflection." 2013-02-13 23:17:54 +00:00
Scott Main
f796c27933 am e526eedb: am 1f6dbc0d: am c6608215: am d51a894a: docs: fix tools sidenav for offline docs 
# Via Android Git Automerger (3) and Scott Main (1)
* commit 'e526eedb8e0145f96991219abd9022ef52f4b976':
  docs: fix tools sidenav for offline docs
 2013-02-13 15:17:02 -08:00