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

100251 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mathias Agopian
f9136fd969 get rid of Surface.getIdentity() 
Change-Id: I8b70d77cc1b38009ad71d92025c3beb481a18866
 2013-02-13 17:01:42 -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
Craig Mautner
b0c0b1fd70 Remove unused App methods. 
Now that the Task methods have replaced the App methods remove
the App methods.

Change-Id: I0e7432f2c6f99708759ed8c871d20eb5bd38c3c2
 2013-02-13 15:24:14 -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
Chris Craik
c932760f66 Merge "Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE" 2013-02-13 23:14:58 +00:00
Scott Main
e526eedb8e am 1f6dbc0d: am c6608215: am d51a894a: docs: fix tools sidenav for offline docs 
# Via Android Git Automerger (2) and Scott Main (1)
* commit '1f6dbc0dccd6eba712848ac36bace4fc16f84fd1':
  docs: fix tools sidenav for offline docs
 2013-02-13 15:14:41 -08:00
Svetoslav
eb26fbe427 Merge "Fixing a NPE in accessibility manager service." 2013-02-13 23:14:10 +00:00
Scott Main
1f6dbc0dcc am c6608215: am d51a894a: docs: fix tools sidenav for offline docs 
# Via Android Git Automerger (1) and Scott Main (1)
* commit 'c660821502e5e27d10ea2d9248fb3c700f5560e5':
  docs: fix tools sidenav for offline docs
 2013-02-13 15:13:24 -08:00
Irfan Sheriff
6e1a0738e9 Merge "Expose EAP config API" 2013-02-13 23:12:45 +00:00
Scott Main
c660821502 am d51a894a: docs: fix tools sidenav for offline docs 
# Via Scott Main
* commit 'd51a894a50b6dd48023fdc5b79c6f889a3988903':
  docs: fix tools sidenav for offline docs
 2013-02-13 15:11:19 -08:00
Martijn Coenen
21654f9efc Merge "Add exception types for NfcEe operations." 2013-02-13 23:10:56 +00:00
Scott Main
d51a894a50 docs: fix tools sidenav for offline docs 
Change-Id: If15ec25f395d9e18f35085488b75be8f84a6d42f
 2013-02-13 15:06:41 -08:00
Stephen Hines
9b10e27d60 Merge "Add rsnScriptForEachClipped() implementation with no param array." 2013-02-13 23:06:34 +00:00
Svetoslav
0726843ea0 Fixing a NPE in accessibility manager service. 
There was a missing null checks as a result of a recent
refactoring.

bug:8185435

Change-Id: I3a1e256b434755b3a27f609dd2b6aeec31aa9a4f
 2013-02-13 14:59:00 -08:00