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

209678 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
d416398c3f Merge "Re-enable -Werror on clang" 2015-07-30 16:26:29 +00:00
Elliott Hughes
734ae3554d am 1db1b582: am 204b4157: am f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK." 
* commit '1db1b5821f6819a602f2dda5950d12b6f6183c36':
  Use _WIN32 rather than HAVE_WINSOCK.
 2015-07-30 16:01:20 +00:00
Elliott Hughes
1db1b5821f am 204b4157: am f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK." 
* commit '204b4157b3fdbeea8859c4ad0e29be18d74e6f5f':
  Use _WIN32 rather than HAVE_WINSOCK.
 2015-07-30 15:47:11 +00:00
Elliott Hughes
204b4157b3 am f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK." 
* commit 'f8a6a2f602ad4ec049b2d2d4741571a76c3d014b':
  Use _WIN32 rather than HAVE_WINSOCK.
 2015-07-30 15:32:51 +00:00
Elliott Hughes
f8a6a2f602 Merge "Use _WIN32 rather than HAVE_WINSOCK." 2015-07-30 15:19:09 +00:00
Derek Sollenberger
897863baeb Merge "Support High Contrast Text for all canvas types" 2015-07-30 13:15:14 +00:00
Jim Miller
23e8619a10 am 5745eead: am ea5de59e: am e9338ac3: am be869b66: am 30c5da9c: Don\'t call cancel() when fingerprint auth fails 
* commit '5745eead22ecd70fd9d418f1a6ac23d837dbdbe8':
  Don't call cancel() when fingerprint auth fails
 2015-07-30 05:35:45 +00:00
Jim Miller
5745eead22 am ea5de59e: am e9338ac3: am be869b66: am 30c5da9c: Don\'t call cancel() when fingerprint auth fails 
* commit 'ea5de59e437a24fc6b6140762a43f99228fbaf8d':
  Don't call cancel() when fingerprint auth fails
 2015-07-30 05:23:34 +00:00
Jim Miller
ea5de59e43 am e9338ac3: am be869b66: am 30c5da9c: Don\'t call cancel() when fingerprint auth fails 
* commit 'e9338ac35aad34a2b882d73a0f9ca40558057f34':
  Don't call cancel() when fingerprint auth fails
 2015-07-30 05:08:13 +00:00
Jim Miller
e9338ac35a am be869b66: am 30c5da9c: Don\'t call cancel() when fingerprint auth fails 
* commit 'be869b667142d3dc8723f19951b4d6ba2c055b24':
  Don't call cancel() when fingerprint auth fails
 2015-07-30 04:55:59 +00:00
Jim Miller
be869b6671 am 30c5da9c: Don\'t call cancel() when fingerprint auth fails 
* commit '30c5da9cc20cc4b9ce820963c6f58d7826f46eaa':
  Don't call cancel() when fingerprint auth fails
 2015-07-30 04:44:20 +00:00
Jim Miller
30c5da9cc2 Don't call cancel() when fingerprint auth fails 
KeyguardUpdateMonitor should not call cancel() when fingerprint
auth fails. The life cycle will continue until an actual error
occurs or the maximum number of retries is reached.

Fixes bug 22562277

Change-Id: I36291d025de9c049cc7f7924f692c8c21349bb7b
 2015-07-30 04:31:37 +00:00
Daniel Sandler
8515917246 am 202dd44a: am 5ea22216: am 82935916: am 033fe243: am bbe1682b: Merge changes from topic \'fix-media-notifications\' into mnc-dev 
* commit '202dd44a90439eb823566b718c5a8fb159d73a73':
  Fully support Icons in Notification actions.
  Fix media notification action icons.
 2015-07-30 04:05:19 +00:00
Daichi Hirono
ff2fed078d Merge "Extract common initialization of MtpDocumentsProviderTest into setUp method." 2015-07-30 03:59:25 +00:00
Daniel Sandler
202dd44a90 am 5ea22216: am 82935916: am 033fe243: am bbe1682b: Merge changes from topic \'fix-media-notifications\' into mnc-dev 
* commit '5ea22216dda8cd13f68f4dc8f405c9809d6c9e37':
  Fully support Icons in Notification actions.
  Fix media notification action icons.
 2015-07-30 03:52:22 +00:00
Daniel Sandler
5ea22216dd am 82935916: am 033fe243: am bbe1682b: Merge changes from topic \'fix-media-notifications\' into mnc-dev 
* commit '829359163dd8c26232627e781ef30ab1373d4463':
  Fully support Icons in Notification actions.
  Fix media notification action icons.
 2015-07-30 03:38:09 +00:00
Daniel Sandler
829359163d am 033fe243: am bbe1682b: Merge changes from topic \'fix-media-notifications\' into mnc-dev 
* commit '033fe243a75f6e5e7ba8f75bd829bddaf213c7c2':
  Fully support Icons in Notification actions.
  Fix media notification action icons.
 2015-07-30 03:25:12 +00:00
Daniel Sandler
033fe243a7 am bbe1682b: Merge changes from topic \'fix-media-notifications\' into mnc-dev 
* commit 'bbe1682b1652c37b66609676e5829517279ff141':
  Fully support Icons in Notification actions.
  Fix media notification action icons.
 2015-07-30 03:15:17 +00:00
Paul Jensen
722113aa5f am 917b275d: am 06287d1c: am 9a2314b0: am 682fd6ae: am a991c66c: Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev 
* commit '917b275d6b54b08edb6326512d7e48a02163e730':
  Fix missing onLost NetworkCallbacks when network loses capability
 2015-07-30 03:12:21 +00:00
Paul Jensen
917b275d6b am 06287d1c: am 9a2314b0: am 682fd6ae: am a991c66c: Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev 
* commit '06287d1c1859c9eafb0b4e195e57215a7e9af59c':
  Fix missing onLost NetworkCallbacks when network loses capability
 2015-07-30 02:57:30 +00:00
Daniel Sandler
bbe1682b16 Merge changes from topic 'fix-media-notifications' into mnc-dev 
* changes:
  Fully support Icons in Notification actions.
  Fix media notification action icons.
 2015-07-30 02:57:06 +00:00
Paul Jensen
06287d1c18 am 9a2314b0: am 682fd6ae: am a991c66c: Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev 
* commit '9a2314b0bc52a7185350237c0eed685202e56298':
  Fix missing onLost NetworkCallbacks when network loses capability
 2015-07-30 02:44:19 +00:00
Dianne Hackborn
24982dc19e am 9820374a: am f228f455: am 17043db8: am 69e7fa8a: am 8d3a67a8: Merge "More maybe fix issue #22765972: Binder transactions running out..." into mnc-dev 
* commit '9820374a5facbcde9f49c8cdf10cfd8ab83f0599':
  More maybe fix issue #22765972: Binder transactions running out...
 2015-07-30 02:40:07 +00:00
Paul Jensen
9a2314b0bc am 682fd6ae: am a991c66c: Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev 
* commit '682fd6aedea87e345f033b489ef9f6008bd19c30':
  Fix missing onLost NetworkCallbacks when network loses capability
 2015-07-30 02:36:45 +00:00
Dianne Hackborn
9820374a5f am f228f455: am 17043db8: am 69e7fa8a: am 8d3a67a8: Merge "More maybe fix issue #22765972: Binder transactions running out..." into mnc-dev 
* commit 'f228f455ea7fbec00f731773e5a51f55e9eb792f':
  More maybe fix issue #22765972: Binder transactions running out...
 2015-07-30 02:26:51 +00:00
Paul Jensen
682fd6aede am a991c66c: Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev 
* commit 'a991c66c12da30d0240ac6c98736edee93d95977':
  Fix missing onLost NetworkCallbacks when network loses capability
 2015-07-30 02:20:49 +00:00
Dianne Hackborn
f228f455ea am 17043db8: am 69e7fa8a: am 8d3a67a8: Merge "More maybe fix issue #22765972: Binder transactions running out..." into mnc-dev 
* commit '17043db8e95b86f63c5aa4ab8c065f7c51d6e1e5':
  More maybe fix issue #22765972: Binder transactions running out...
 2015-07-30 02:15:58 +00:00
Paul Jensen
a991c66c12 Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev 2015-07-30 02:10:50 +00:00
Dianne Hackborn
17043db8e9 am 69e7fa8a: am 8d3a67a8: Merge "More maybe fix issue #22765972: Binder transactions running out..." into mnc-dev 
* commit '69e7fa8a521a402b4a80aafbca203f66b3323123':
  More maybe fix issue #22765972: Binder transactions running out...
 2015-07-30 02:00:35 +00:00
Dianne Hackborn
69e7fa8a52 am 8d3a67a8: Merge "More maybe fix issue #22765972: Binder transactions running out..." into mnc-dev 
* commit '8d3a67a8d475b43cbac50a2a186a19f4a29c7892':
  More maybe fix issue #22765972: Binder transactions running out...
 2015-07-30 01:44:38 +00:00
Jason Monk
c6066c2b38 am 58562d37: am fb4f4cd3: am 25dea652: am 41402867: am beb3185f: Merge "Fix touch target for settings icon" into mnc-dev 
* commit '58562d37c5d83f7cab23e7730986bf99e5a11767':
  Fix touch target for settings icon
 2015-07-30 01:35:41 +00:00
Jorim Jaggi
28441dceba am 25e8a02e: am 8e116bef: am cd6e8015: am 8e43c3e7: am 26aa04c3: Fix state weirdness in the panel 
* commit '25e8a02e7005c080decd7b6119e03d8ab7f58c4f':
  Fix state weirdness in the panel
 2015-07-30 01:35:34 +00:00
Dianne Hackborn
8d3a67a8d4 Merge "More maybe fix issue #22765972: Binder transactions running out..." into mnc-dev 2015-07-30 01:32:09 +00:00
Jason Monk
58562d37c5 am fb4f4cd3: am 25dea652: am 41402867: am beb3185f: Merge "Fix touch target for settings icon" into mnc-dev 
* commit 'fb4f4cd3139f19402aa59725f41417e00c715366':
  Fix touch target for settings icon
 2015-07-30 01:18:01 +00:00
Jorim Jaggi
25e8a02e70 am 8e116bef: am cd6e8015: am 8e43c3e7: am 26aa04c3: Fix state weirdness in the panel 
* commit '8e116befc9dc59d47e64842012ba3d496e75ad3b':
  Fix state weirdness in the panel
 2015-07-30 01:17:56 +00:00
Jason Monk
fb4f4cd313 am 25dea652: am 41402867: am beb3185f: Merge "Fix touch target for settings icon" into mnc-dev 
* commit '25dea652a0fe7c5c7d210c36a32d4c451e4f8983':
  Fix touch target for settings icon
 2015-07-30 01:06:55 +00:00
Jorim Jaggi
8e116befc9 am cd6e8015: am 8e43c3e7: am 26aa04c3: Fix state weirdness in the panel 
* commit 'cd6e80159670fdf02ce9c922a4469f2c2ec5a340':
  Fix state weirdness in the panel
 2015-07-30 01:06:46 +00:00
Dianne Hackborn
6b42bc0e21 More maybe fix issue #22765972: Binder transactions running out... 
...of address space causing package manager to fail

Make sure to flush binder commands when done with an async task.

Change-Id: I9f171add7051587ab854226b97a12c7e1844ad5d
 2015-07-29 17:58:33 -07:00
Jason Monk
25dea652a0 am 41402867: am beb3185f: Merge "Fix touch target for settings icon" into mnc-dev 
* commit '414028675297b33d9899ccab2f04e908b7aa8c1d':
  Fix touch target for settings icon
 2015-07-30 00:53:08 +00:00
Jorim Jaggi
cd6e801596 am 8e43c3e7: am 26aa04c3: Fix state weirdness in the panel 
* commit '8e43c3e76f8edb9408dd49d673f76044e335ecd6':
  Fix state weirdness in the panel
 2015-07-30 00:53:04 +00:00
Jorim Jaggi
59107156d8 am c778b9c5: am baec89e0: am 647ef8c8: am de8b10ee: am 95c6daed: Fix doze mode 
* commit 'c778b9c5a55389cd2d2c34f16d26fc7755807a7a':
  Fix doze mode
 2015-07-30 00:51:08 +00:00
Wale Ogunwale
fc8817536a am 82c40d5e: am 8019b9d2: am c66cdf2c: am 70e67733: am e8246ff7: Merge "Fixed out of bounds exception while handling app crash" into mnc-dev 
* commit '82c40d5e01c645c5b51acd0b57f06887dd6148c2':
  Fixed out of bounds exception while handling app crash
 2015-07-30 00:51:00 +00:00
Jorim Jaggi
430a7fe921 am 32dfe1b7: am 9ce35c2c: am db6db412: am 0657f9f3: am 4a0e791c: Workaround View.post issues to fix runtime crash 
* commit '32dfe1b70e0aa3492a3f5f6d0c34553fd3d4ed5f':
  Workaround View.post issues to fix runtime crash
 2015-07-30 00:50:52 +00:00
Elliott Hughes
59cbe8d107 Use _WIN32 rather than HAVE_WINSOCK. 
Change-Id: I0821d2af8473c359e8b73aec455000cb7c42f690
 2015-07-29 17:49:27 -07:00
Steve McKay
75952bac00 Merge "Add a TestSuite for running unittests." 2015-07-30 00:45:37 +00:00
Jason Monk
4140286752 am beb3185f: Merge "Fix touch target for settings icon" into mnc-dev 
* commit 'beb3185f01ce5d06f1503d37a4ed8f93b8bf76e0':
  Fix touch target for settings icon
 2015-07-30 00:36:29 +00:00
Jorim Jaggi
8e43c3e76f am 26aa04c3: Fix state weirdness in the panel 
* commit '26aa04c3c4d16ab7bf47d414fac697721e5843cd':
  Fix state weirdness in the panel
 2015-07-30 00:36:25 +00:00
Jorim Jaggi
c778b9c5a5 am baec89e0: am 647ef8c8: am de8b10ee: am 95c6daed: Fix doze mode 
* commit 'baec89e0de6808a14e168289203e7da76b210ecb':
  Fix doze mode
 2015-07-30 00:35:26 +00:00
Wale Ogunwale
82c40d5e01 am 8019b9d2: am c66cdf2c: am 70e67733: am e8246ff7: Merge "Fixed out of bounds exception while handling app crash" into mnc-dev 
* commit '8019b9d2983660be049d33bbd3a6a95173015540':
  Fixed out of bounds exception while handling app crash
 2015-07-30 00:35:21 +00:00
Jorim Jaggi
32dfe1b70e am 9ce35c2c: am db6db412: am 0657f9f3: am 4a0e791c: Workaround View.post issues to fix runtime crash 
* commit '9ce35c2ce3450a017011262f89eb39217a614d08':
  Workaround View.post issues to fix runtime crash
 2015-07-30 00:35:15 +00:00