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

178068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
6cc211669c am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev automerge: 6cc44cc 
automerge: 05e2ada

* commit '05e2ada58a79994170e8e98ff9a619715cdddc28':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
 2014-12-12 04:45:29 +00:00
Wink Saville
05e2ada58a am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 
automerge: 6cc44cc

* commit '6cc44cce0e375b165580a8061359b2ff163a4556':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
 2014-12-12 04:42:38 +00:00
Wink Saville
6cc44cce0e am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 
* commit '6e04a7b65488656c4cb72d99d285050d56068112':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
 2014-12-12 04:37:40 +00:00
C. Sean Young
28ca1f628c Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2014-12-12 04:35:32 +00:00
Iliyan Malchev
6f8b9bc9c1 am 16568705: am 45838de9: fix Uss accounting in getPssPid() automerge: 72468d2 
* commit '16568705855f6c8dd78bc188c17e0237c5e827c0':
  fix Uss accounting in getPssPid()
 2014-12-12 04:35:05 +00:00
Jim Miller
0e0f30eda0 am 69935f9a: am 4841a787: Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev automerge: 0ca6b7f 
* commit '69935f9a053a14da8677b5957bf72ad1746ebad8':
  Attempt to fix keyguard missing bug
 2014-12-12 04:35:00 +00:00
John Reck
30839ce439 am ec9b598c: am b9a4d15d: Merge "Force-flush state sync on texid change" into lmp-mr1-dev automerge: b21a7ad 
* commit 'ec9b598c7be65abb5ceb9d82e752c50f7e93deab':
  Force-flush state sync on texid change
 2014-12-12 04:34:55 +00:00
John Reck
d4d19d3714 am b9a4d15d: Merge "Force-flush state sync on texid change" into lmp-mr1-dev automerge: b21a7ad 
automerge: ec9b598

* commit 'ec9b598c7be65abb5ceb9d82e752c50f7e93deab':
  Force-flush state sync on texid change
 2014-12-12 04:33:59 +00:00
Iliyan Malchev
1656870585 am 45838de9: fix Uss accounting in getPssPid() 
automerge: 72468d2

* commit '72468d2d146f737b2b5d0223687b8fbc52723c76':
  fix Uss accounting in getPssPid()
 2014-12-12 04:30:52 +00:00
Chris Craik
a1c3fdfbc7 am 3f454e7d: am 63c7b246: Merge "Correct layer size formatting in trace" into lmp-mr1-dev automerge: 00905a9 
* commit '3f454e7d1cf7103e312f67f745f01f00fa49df13':
  Correct layer size formatting in trace
 2014-12-12 04:30:44 +00:00
Craig Mautner
10c9c66815 am 2d6627a9: am 72b047c6: Merge "Don\'t apply animations to windows that are showing" into lmp-mr1-dev automerge: 922f8e2 
* commit '2d6627a9f28c5c31fec5da3dcf48d96ff7a0d893':
  Don't apply animations to windows that are showing
 2014-12-12 04:30:39 +00:00
Jim Miller
69935f9a05 am 4841a787: Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev 
automerge: 0ca6b7f

* commit '0ca6b7f98085c079ccfb4b799fba5f570380a827':
  Attempt to fix keyguard missing bug
 2014-12-12 04:29:11 +00:00
John Reck
ec9b598c7b am b9a4d15d: Merge "Force-flush state sync on texid change" into lmp-mr1-dev 
automerge: b21a7ad

* commit 'b21a7ad02e43900ea5480e796cb1518bd5829e3f':
  Force-flush state sync on texid change
 2014-12-12 04:27:14 +00:00
David Friedman
2b7b23e9b4 am 99385aa9: am e84bf9fd: am d0d76540: am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs automerge: e90a170 
* commit '99385aa9928b1e860b0baefa73374018809c94ad':
  Adds link to related video.
 2014-12-12 04:26:16 +00:00
Alan Viverette
040b761af9 am 3ead4127: am ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev automerge: 4b7f724 
* commit '3ead4127ae493508d064e106ec12f299e7116e8a':
  Improve time picker accessibility
 2014-12-12 04:26:12 +00:00
Winson Chung
d64e38965f am 51fafe26: am 47d9a58c: Merge "Fixing issue with old thumbnails on first launch of app. (Bug 18718114)" into lmp-mr1-dev automerge: 8c8c99c 
* commit '51fafe26a8354404ce6ec94b9c6c2f20ede0d8a9':
  Fixing issue with old thumbnails on first launch of app. (Bug 18718114)
 2014-12-12 04:26:06 +00:00
Joe Fernandez
80cfbedbfd am 6ea9db4b: am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs automerge: a878256 
* commit '6ea9db4b6434b9f2c1059e7c4a050ea4245a7342':
  docs: studio basics haxm updates
 2014-12-12 04:25:59 +00:00
Ricardo Cervera
dd4b92b3fa am c0276ebd: am af7070e6: am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs automerge: 575c8c9 
* commit 'c0276ebd93554b9c3bfde2587b00ca79afa6ed05':
  docs: Fixes to watch faces docs.
 2014-12-12 04:25:54 +00:00
Rich Slogar
bde459f33e am cc46ad8d: am 0564cee3: am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs automerge: 51f1c26 
* commit 'cc46ad8d66d71867ff59bcd73b8e0861ef1744c5':
  docs: studio bundle update
 2014-12-12 04:25:49 +00:00
Chris Craik
3f454e7d1c am 63c7b246: Merge "Correct layer size formatting in trace" into lmp-mr1-dev 
automerge: 00905a9

* commit '00905a984c07ffc9960ce83548631c59aae37ec6':
  Correct layer size formatting in trace
 2014-12-12 04:25:43 +00:00
Craig Mautner
2d6627a9f2 am 72b047c6: Merge "Don\'t apply animations to windows that are showing" into lmp-mr1-dev 
automerge: 922f8e2

* commit '922f8e2c0f58e57d02ab136f24f135553e6d9720':
  Don't apply animations to windows that are showing
 2014-12-12 04:24:34 +00:00
David Friedman
99385aa992 am e84bf9fd: am d0d76540: am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs 
automerge: e90a170

* commit 'e90a170f67f91d9b0166ac4f0de07f63207b1bce':
  Adds link to related video.
 2014-12-12 04:23:07 +00:00
Wink Saville
6e04a7b654 Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 2014-12-12 04:22:40 +00:00
Alan Viverette
3ead4127ae am ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev 
automerge: 4b7f724

* commit '4b7f724fb23166f892781ae7daa2df76bede2134':
  Improve time picker accessibility
 2014-12-12 04:21:42 +00:00
Joe Fernandez
e5624ae02b am 11fc651a: am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs automerge: cc08e61 
* commit '11fc651aefbcdebc646f347e4981204d3ef7b0a7':
  docs: platform updates for api 21
 2014-12-12 04:21:22 +00:00
Joe Fernandez
3e42bb70e4 am 4cb6d10d: am e3bac3bc: am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs automerge: 11bccb1 
* commit '4cb6d10d5e7d7b21a1d9ee2d0b69c7a34f86503c':
  docs: sdk tools 24.0.1 revisions
 2014-12-12 04:21:17 +00:00
Andrew Solovay
117a8f8af0 am d96ed254: am 13e0a650: am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes" automerge: fe96791 
* commit 'd96ed254db9c9eea778bdc8fee2a983d3a38acae':
  docs: Added info about managed profiles to "Android 5.0 Changes"
 2014-12-12 04:21:12 +00:00
Ruben Brunk
00b2eb2bc0 am c7c20b34: am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev automerge: 81b381b 
* commit 'c7c20b34ecbaef5c1f60115755e87dbaaf0cfb4c':
  camera2: Fix LEGACY YUV production and orientation.
 2014-12-12 04:21:07 +00:00
Winson Chung
51fafe26a8 am 47d9a58c: Merge "Fixing issue with old thumbnails on first launch of app. (Bug 18718114)" into lmp-mr1-dev 
automerge: 8c8c99c

* commit '8c8c99cf0873e10f19d79bfe79d8ea56848dadb4':
  Fixing issue with old thumbnails on first launch of app. (Bug 18718114)
 2014-12-12 04:20:19 +00:00
Joe Fernandez
6ea9db4b64 am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs 
automerge: a878256

* commit 'a878256b59e1766ce918257dbfe343b0d3d0ec2d':
  docs: studio basics haxm updates
 2014-12-12 04:19:03 +00:00
Ricardo Cervera
c0276ebd93 am af7070e6: am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs 
automerge: 575c8c9

* commit '575c8c9fcdc2ee8ed614ac9b6a4992fffe8ccea4':
  docs: Fixes to watch faces docs.
 2014-12-12 04:17:41 +00:00
Rich Slogar
cc46ad8d66 am 0564cee3: am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs 
automerge: 51f1c26

* commit '51f1c26b5b4b2c514fd5a4ca11de98542ccd4166':
  docs: studio bundle update
 2014-12-12 04:16:30 +00:00
Joe Fernandez
11fc651aef am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs 
automerge: cc08e61

* commit 'cc08e619d6a946b58b2aae857e3190b5996c07b8':
  docs: platform updates for api 21
 2014-12-12 04:14:43 +00:00
Joe Fernandez
4cb6d10d5e am e3bac3bc: am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs 
automerge: 11bccb1

* commit '11bccb1ebe457bc3cca582320d13a459920425d9':
  docs: sdk tools 24.0.1 revisions
 2014-12-12 04:13:20 +00:00
Jason Monk
fe97467bfc am 239c7667: am 7d8ccb41: Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev automerge: 70cf2f7 
* commit '239c7667dd71754029b27fdec7b63f7f8e15c86b':
  Fix crash in BluetoothControllerImpl
 2014-12-12 04:12:21 +00:00
Amit Mahajan
368cf66e20 am dee84a87: am c5da1d3d: Merge "Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network." into lmp-mr1-dev automerge: cac8662 
* commit 'dee84a8796ed60a4a87d95238e160394fb166a95':
  Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network.
 2014-12-12 04:12:16 +00:00
John Spurlock
281dc0aadf am 97a2be86: am 0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev automerge: 6f9a717 
* commit '97a2be8672febec536641fb37f4900e4402035b0':
  Zen: Leave zen=none on manual ringer mode stream volume changes.
 2014-12-12 04:12:10 +00:00
Andrew Solovay
d96ed254db am 13e0a650: am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes" 
automerge: fe96791

* commit 'fe967912faf8ddf79d9eab794c4a2417758b716d':
  docs: Added info about managed profiles to "Android 5.0 Changes"
 2014-12-12 04:11:53 +00:00
Ruben Brunk
c7c20b34ec am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev 
automerge: 81b381b

* commit '81b381b82e83ec742a8a6541dabbc63dae087c0a':
  camera2: Fix LEGACY YUV production and orientation.
 2014-12-12 04:09:55 +00:00
Jason Monk
239c7667dd am 7d8ccb41: Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev 
automerge: 70cf2f7

* commit '70cf2f72f2e19570d81c1365164313437b38ffd5':
  Fix crash in BluetoothControllerImpl
 2014-12-12 04:08:33 +00:00
Amit Mahajan
dee84a8796 am c5da1d3d: Merge "Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network." into lmp-mr1-dev 
automerge: cac8662

* commit 'cac8662943b28663fefc6e5315a7b9acd514bfdb':
  Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network.
 2014-12-12 04:05:59 +00:00
John Spurlock
97a2be8672 am 0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev 
automerge: 6f9a717

* commit '6f9a71729f6ba7521ed8461ec8b556a8907743b1':
  Zen: Leave zen=none on manual ringer mode stream volume changes.
 2014-12-12 04:04:40 +00:00
Iliyan Malchev
72468d2d14 am 45838de9: fix Uss accounting in getPssPid() 
* commit '45838de942b87150fc3b03a8b943841a8647fd81':
  fix Uss accounting in getPssPid()
 2014-12-12 00:34:35 +00:00
Iliyan Malchev
45838de942 fix Uss accounting in getPssPid() 
Change-Id: I0d1dc81d127afbf3a7d7b4b86865ccb0e8bd7d4c
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2014-12-12 00:20:24 +00:00
Jim Miller
0ca6b7f980 am 4841a787: Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev 
* commit '4841a787b3380ba045a465e347668729b19f3d79':
  Attempt to fix keyguard missing bug
 2014-12-11 23:41:03 +00:00
Jim Miller
4841a787b3 Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev 2014-12-11 23:33:10 +00:00
John Reck
b21a7ad02e am b9a4d15d: Merge "Force-flush state sync on texid change" into lmp-mr1-dev 
* commit 'b9a4d15d0942a55c7dc32a471ee40890986e3fab':
  Force-flush state sync on texid change
 2014-12-11 22:49:52 +00:00
Chris Craik
00905a984c am 63c7b246: Merge "Correct layer size formatting in trace" into lmp-mr1-dev 
* commit '63c7b24645d94c92dc6dc32d57c23b5167950c8b':
  Correct layer size formatting in trace
 2014-12-11 22:49:46 +00:00
John Reck
b9a4d15d09 Merge "Force-flush state sync on texid change" into lmp-mr1-dev 2014-12-11 22:44:19 +00:00
Chris Craik
63c7b24645 Merge "Correct layer size formatting in trace" into lmp-mr1-dev 2014-12-11 22:43:18 +00:00