Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
175,803 Commits 3 Branches 0 Tags
0fe87f68d16f4eb855b52da5dcc6bfbea47a92be
Commit Graph

175803 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ihab Awad
0fe87f68d1 am 97f65689: am 1503623c: am ac70c647: Merge "Fix to a compatibility patch that was missed in ag/587241" into lmp-mr1-dev 
* commit '97f656899924d5494497b5e88d854f0657e4d54d':
  Fix to a compatibility patch that was missed in ag/587241
 2014-12-01 21:52:47 +00:00
John Reck
c5cf471758 am d7af6eaa: am d51205fd: am 6afc5cf3: Merge "Prevent calling GL functions with an invalid surface" 
* commit 'd7af6eaace4ffdd3635a1cdeff65e9dc1af39f67':
  Prevent calling GL functions with an invalid surface
 2014-12-01 21:47:03 +00:00
Ihab Awad
97f6568999 am 1503623c: am ac70c647: Merge "Fix to a compatibility patch that was missed in ag/587241" into lmp-mr1-dev 
* commit '1503623c73935e71ff7c2e4d6bbdf546e7f0b37d':
  Fix to a compatibility patch that was missed in ag/587241
 2014-12-01 21:46:04 +00:00
John Reck
d7af6eaace am d51205fd: am 6afc5cf3: Merge "Prevent calling GL functions with an invalid surface" 
* commit 'd51205fda7351ca32e54ef34b32e72f6c7c79847':
  Prevent calling GL functions with an invalid surface
 2014-12-01 21:40:32 +00:00
Ihab Awad
1503623c73 am ac70c647: Merge "Fix to a compatibility patch that was missed in ag/587241" into lmp-mr1-dev 
* commit 'ac70c6473160d96aa8adf4677e3dde320256ef8d':
  Fix to a compatibility patch that was missed in ag/587241
 2014-12-01 21:40:12 +00:00
John Reck
d51205fda7 am 6afc5cf3: Merge "Prevent calling GL functions with an invalid surface" 
* commit '6afc5cf3d9e1a0c0eb6ecd6eea258f1ccd37bef3':
  Prevent calling GL functions with an invalid surface
 2014-12-01 21:35:40 +00:00
Ihab Awad
ac70c64731 Merge "Fix to a compatibility patch that was missed in ag/587241" into lmp-mr1-dev 2014-12-01 21:35:30 +00:00
John Reck
6afc5cf3d9 Merge "Prevent calling GL functions with an invalid surface" 2014-12-01 21:28:27 +00:00
Mike Lockwood
6e8fea14cc Merge "ParcelFileDescriptor: add support for non-stream socket pairs." 2014-12-01 21:17:36 +00:00
Craig Mautner
4844f939b6 am b62b1b03: am 94dab3ae: am 9dba1073: Merge "Force additional layout pass after drawing" into lmp-mr1-dev 
* commit 'b62b1b03792e7c583ec1a51a3d621deb51663414':
  Force additional layout pass after drawing
 2014-12-01 21:12:25 +00:00
Craig Mautner
b62b1b0379 am 94dab3ae: am 9dba1073: Merge "Force additional layout pass after drawing" into lmp-mr1-dev 
* commit '94dab3ae5468e2c6325b47aa633d08dc7727198b':
  Force additional layout pass after drawing
 2014-12-01 21:06:36 +00:00
Craig Mautner
94dab3ae54 am 9dba1073: Merge "Force additional layout pass after drawing" into lmp-mr1-dev 
* commit '9dba10732802bf162c0098d2591aa284e55b7b5e':
  Force additional layout pass after drawing
 2014-12-01 21:00:51 +00:00
Craig Mautner
9dba107328 Merge "Force additional layout pass after drawing" into lmp-mr1-dev 2014-12-01 20:56:09 +00:00
Wale Ogunwale
0ea8edef69 am ea64d0be: am e05fbd69: am 997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev 
* commit 'ea64d0beea59e3350bea0c6fe8d7cef807f82601':
  Added unique id to display devices and their settings.
 2014-12-01 20:44:06 +00:00
Wale Ogunwale
ea64d0beea am e05fbd69: am 997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev 
* commit 'e05fbd6901eb8c89ea18fe90c15d69e7c17596ae':
  Added unique id to display devices and their settings.
 2014-12-01 20:37:01 +00:00
Shishir Agrawal
688b107330 am 7158dfb1: am 592707c5: am 089f95f4: Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev 
* commit '7158dfb1be1689282e0014bd779b7510e85022c8':
  TelephonyManager.setLine1NumberForDisplay should return a boolean.
 2014-12-01 20:36:12 +00:00
Mike Lockwood
ced0c25a40 ParcelFileDescriptor: add support for non-stream socket pairs. 
For example, we can use this to create SOCK_SEQPACKET socket pairs.

Change-Id: Ief5c1dab3cbbe40a756d37e77968b41511297bec
 2014-12-01 12:36:11 -08:00
Wale Ogunwale
e05fbd6901 am 997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev 
* commit '997e632f59b070dabf71d9e807847c0643da92ac':
  Added unique id to display devices and their settings.
 2014-12-01 20:30:33 +00:00
Ihab Awad
de06133569 Fix to a compatibility patch that was missed in ag/587241 
Change-Id: I2339085a9a2cc0d6a3f4b5e07130b5178a62c729
 2014-12-01 12:30:00 -08:00
Shishir Agrawal
7158dfb1be am 592707c5: am 089f95f4: Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev 
* commit '592707c5250655cbed2b48848701b288605c01ac':
  TelephonyManager.setLine1NumberForDisplay should return a boolean.
 2014-12-01 20:29:07 +00:00
Chris Craik
fafd173088 am d1428730: am 1fd78e92: am 659de832: Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev 
* commit 'd14287301e6c8b82d3554d0dfe0f3958f0966545':
  Enable stencil clipping within clearLayerRegions
 2014-12-01 20:28:21 +00:00
Wale Ogunwale
997e632f59 Merge "Added unique id to display devices and their settings." into lmp-mr1-dev 2014-12-01 20:26:06 +00:00
Mike Lockwood
bcf4fec94c Merge "Remove polling for ALSA device files in USB audio device detection." 2014-12-01 20:25:20 +00:00
Shishir Agrawal
592707c525 am 089f95f4: Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev 
* commit '089f95f4483c95873cf0084c11cb23a0f5b32c3c':
  TelephonyManager.setLine1NumberForDisplay should return a boolean.
 2014-12-01 20:22:36 +00:00
Mike Lockwood
fb0a22eb62 Remove polling for ALSA device files in USB audio device detection. 
Change-Id: I993fe41707fc02c9449800c7325aaf7270fb892e
 2014-12-01 12:21:41 -08:00
Chris Craik
d14287301e am 1fd78e92: am 659de832: Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev 
* commit '1fd78e9268a5c884cfcfec2133b62a11a74dbc00':
  Enable stencil clipping within clearLayerRegions
 2014-12-01 20:21:07 +00:00
Shishir Agrawal
089f95f448 Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev 2014-12-01 20:17:26 +00:00
Chris Craik
1fd78e9268 am 659de832: Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev 
* commit '659de832b9796e14de44b6411980a65e33283a93':
  Enable stencil clipping within clearLayerRegions
 2014-12-01 20:13:06 +00:00
Chris Craik
659de832b9 Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev 2014-12-01 20:08:29 +00:00
Geoff Mendal
5af2dd5c99 am 9259ad72: (-s ours) am f93c82ae: (-s ours) am f90404ca: (-s ours) am ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '9259ad7282c428dcdefb8f00af40529b4cbe1a95':
  Import translations. DO NOT MERGE
 2014-12-01 20:07:45 +00:00
Joe Fernandez
a097085f0f am 00ba894b: am 2cbfc845: am 353da3f9: am 88e04fcb: am e9a816c5: am 1f5acf84: docs: December 2014 Dashboard update 
* commit '00ba894b49d2040ca5d4478c76f4f10f4f9759f5':
  docs: December 2014 Dashboard update
 2014-12-01 20:07:41 +00:00
smain@google.com
dab3382a6d am 230df257: am e979e259: am 77e889ed: am 446bab79: am 7512a46e: am fdff66ee: change Trulia context image 
* commit '230df25726bcb130c4ce0f742c9935da0ad5e793':
  change Trulia context image
 2014-12-01 20:07:36 +00:00
Jeremy Joslin
88eab40f86 am b81134f2: am 33783a96: am 500f7811: Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev 
* commit 'b81134f21187aed11f591526a4f478d411b7f54a':
  Fix the ordering of extra values in the PI.
 2014-12-01 20:07:32 +00:00
Alan Viverette
643b4aa61d am 02cd927d: am 53644fb5: am 015b9e56: Merge "Cancel dialog when TimePickerDialog\'s BUTTON_NEGATIVE is clicked" into lmp-mr1-dev 
* commit '02cd927dffa24479a0ca29b40ead7b28f9e60a7c':
  Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
 2014-12-01 20:07:27 +00:00
Geoff Mendal
825d5c46dd am 8dd80c52: (-s ours) am 533371c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '8dd80c52b09f64a11752941a4d9a30c7e520a9da':
  Import translations. DO NOT MERGE
 2014-12-01 20:07:23 +00:00
Jeff Sharkey
2a3ca185bf am 45207128: am 05d455ca: am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev 
* commit '45207128c5c4f0d1f106af8561bdd156546b0aad':
  Sanitize display names, keep extensions intact.
 2014-12-01 20:07:19 +00:00
Jeff Sharkey
7f9eeaf4c1 am 2f8f394b: resolved conflicts for merge of 916d5163 to lmp-mr1-dev-plus-aosp 
* commit '2f8f394b14ab0ed6b65ce440a2ddc8aa09fbb8fa':
  APK still has privileged flag after being moved from "/system/priv-app"
 2014-12-01 20:07:14 +00:00
Geoff Mendal
9259ad7282 am f93c82ae: (-s ours) am f90404ca: (-s ours) am ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'f93c82ae366970b3c06dedf2b040d000c16d2261':
  Import translations. DO NOT MERGE
 2014-12-01 20:01:21 +00:00
Joe Fernandez
00ba894b49 am 2cbfc845: am 353da3f9: am 88e04fcb: am e9a816c5: am 1f5acf84: docs: December 2014 Dashboard update 
* commit '2cbfc8455d51cb89cdd161f5e46d1f56023c903b':
  docs: December 2014 Dashboard update
 2014-12-01 20:01:15 +00:00
smain@google.com
230df25726 am e979e259: am 77e889ed: am 446bab79: am 7512a46e: am fdff66ee: change Trulia context image 
* commit 'e979e259d22279cd35f9ebcc7b42efbae1b77ce1':
  change Trulia context image
 2014-12-01 20:01:10 +00:00
Jeremy Joslin
b81134f211 am 33783a96: am 500f7811: Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev 
* commit '33783a962f3336400d12cd739ae33b9452ea14be':
  Fix the ordering of extra values in the PI.
 2014-12-01 20:01:02 +00:00
Alan Viverette
02cd927dff am 53644fb5: am 015b9e56: Merge "Cancel dialog when TimePickerDialog\'s BUTTON_NEGATIVE is clicked" into lmp-mr1-dev 
* commit '53644fb5acd394b875723b6483215ba837f8e6c0':
  Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
 2014-12-01 20:00:49 +00:00
Geoff Mendal
8dd80c52b0 am 533371c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '533371c5924cc467ec8dc31cd577390a37898c8d':
  Import translations. DO NOT MERGE
 2014-12-01 20:00:39 +00:00
Jeff Sharkey
45207128c5 am 05d455ca: am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev 
* commit '05d455ca2b83793a81aac2544c388eec8ac140cd':
  Sanitize display names, keep extensions intact.
 2014-12-01 20:00:32 +00:00
Jeff Sharkey
2f8f394b14 resolved conflicts for merge of 916d5163 to lmp-mr1-dev-plus-aosp 
Change-Id: I714b443d66feb7d7416152254d21cac87a6fa451
 2014-12-01 11:57:09 -08:00
Jason Monk
b06a35716d am 0f514474: am c0c34b42: am 03d705ab: Merge "SysUI: QS Wifi get connected wifi rssi from NC" into lmp-mr1-dev 
* commit '0f514474b2c21c17210cec7c812a1c80dd55da19':
  SysUI: QS Wifi get connected wifi rssi from NC
 2014-12-01 19:54:59 +00:00
Amith Yamasani
bd815f90ca am e434a949: am 0c81034c: am 731a5c1a: Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev 
* commit 'e434a94936c8f48bd5158849a09c1e6ce8d6e2d1':
  Fix parsing bug that affects reading back guest restrictions
 2014-12-01 19:54:55 +00:00
Geoff Mendal
23dd8ef105 am 2a36f7e3: (-s ours) am e7f81f3b: (-s ours) am 6ca3ba73: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '2a36f7e3ab87db68ed0a66f25bc79ebe05139891':
  Import translations. DO NOT MERGE
 2014-12-01 19:54:51 +00:00
John Spurlock
aac7a9f4c7 am 34c9ee1a: am 23a99a3a: am 21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev 
* commit '34c9ee1af8980594df096e7759c50277270e658c':
  Volume: Improve inline volume controls used in settings.
 2014-12-01 19:54:45 +00:00
Ihab Awad
6d605377e5 am 984f3c4d: am 8199d6c3: am 6cacf44e: Merge "Telecom API updates (1/6)" into lmp-mr1-dev 
* commit '984f3c4df8e5faad5b0ef30649f9ea1f3bc0dc65':
  Telecom API updates (1/6)
 2014-12-01 19:54:40 +00:00