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

199781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao
480942f5f2 am 24c0de22: am 7807cc25: (-s ours) am e215b464: Merge "Wait for uncrypt to finish before rebooting" 
* commit '24c0de2205b310d185bf57d899d882139a7ecc85':
  Wait for uncrypt to finish before rebooting
 2015-06-10 01:34:40 +00:00
Tao Bao
24c0de2205 am 7807cc25: (-s ours) am e215b464: Merge "Wait for uncrypt to finish before rebooting" 
* commit '7807cc259f4e4a2506c8d37601c947eca68b2d24':
  Wait for uncrypt to finish before rebooting
 2015-06-10 01:23:19 +00:00
Christopher Ferris
34a12cf4d8 am eef3beb1: am 24b90915: am 6c4fc3a0: Merge "Change wtf errors from ASSERT to ERROR." 
* commit 'eef3beb1e3c7bbfd7dd94a1f413bb00ff4d93579':
  Change wtf errors from ASSERT to ERROR.
 2015-06-10 01:10:15 +00:00
Christopher Ferris
a544e16c48 am 8d6417f5: am 0a778262: am 1a4b8288: Merge "Change wtf errors from ASSERT to ERROR." into mnc-dev 
* commit '8d6417f5509dbf7268156af9d42dc3c0f93a8fa0':
  Change wtf errors from ASSERT to ERROR.
 2015-06-10 01:10:10 +00:00
Christopher Ferris
eef3beb1e3 am 24b90915: am 6c4fc3a0: Merge "Change wtf errors from ASSERT to ERROR." 
* commit '24b90915a10e2ccc8e1090364956cf79470dff52':
  Change wtf errors from ASSERT to ERROR.
 2015-06-10 01:04:04 +00:00
Tao Bao
7807cc259f am e215b464: Merge "Wait for uncrypt to finish before rebooting" 
* commit 'e215b46482af78b6259c867815dc5cf2198908d5':
  Wait for uncrypt to finish before rebooting
 2015-06-10 00:55:23 +00:00
Christopher Ferris
8d6417f550 am 0a778262: am 1a4b8288: Merge "Change wtf errors from ASSERT to ERROR." into mnc-dev 
* commit '0a7782625717252c00f39aa0748ece34adf467ce':
  Change wtf errors from ASSERT to ERROR.
 2015-06-10 00:54:00 +00:00
Stefan Kuhne
0204ba2b5b am ff6fe716: am e6581b11: am 011c133e: Merge "Dont create a dummy animation for a transferred animation" into mnc-dev 
* commit 'ff6fe7164e89822a2f8dc124cde4ef8809d46f22':
  Dont create a dummy animation for a transferred animation
 2015-06-10 00:53:48 +00:00
Fyodor Kupolov
39947d63dd am 7e1c4917: am 1f6cbb5d: am c2ae0090: Merge "Do not create profile if FEATURE_MANAGED_USERS is not available" into mnc-dev 
* commit '7e1c4917aba076b2d92e66f6971002996ab63e44':
  Do not create profile if FEATURE_MANAGED_USERS is not available
 2015-06-10 00:53:43 +00:00
Christopher Ferris
24b90915a1 am 6c4fc3a0: Merge "Change wtf errors from ASSERT to ERROR." 
* commit '6c4fc3a08e9ca52a36f7fc83b783185da34abc12':
  Change wtf errors from ASSERT to ERROR.
 2015-06-10 00:46:48 +00:00
Tao Bao
e215b46482 Merge "Wait for uncrypt to finish before rebooting" 2015-06-10 00:43:47 +00:00
Stefan Kuhne
ff6fe7164e am e6581b11: am 011c133e: Merge "Dont create a dummy animation for a transferred animation" into mnc-dev 
* commit 'e6581b11a96442337eeec12f1ca5c87b3408fbe4':
  Dont create a dummy animation for a transferred animation
 2015-06-10 00:40:45 +00:00
Fyodor Kupolov
7e1c4917ab am 1f6cbb5d: am c2ae0090: Merge "Do not create profile if FEATURE_MANAGED_USERS is not available" into mnc-dev 
* commit '1f6cbb5d76cd0e2d0aaab05ae6e779e60ed8caa2':
  Do not create profile if FEATURE_MANAGED_USERS is not available
 2015-06-10 00:40:40 +00:00
Christopher Ferris
0a77826257 am 1a4b8288: Merge "Change wtf errors from ASSERT to ERROR." into mnc-dev 
* commit '1a4b8288ad525ec9e951010151e4ed91bd514043':
  Change wtf errors from ASSERT to ERROR.
 2015-06-10 00:38:44 +00:00
Christopher Ferris
6c4fc3a08e Merge "Change wtf errors from ASSERT to ERROR." 2015-06-10 00:32:25 +00:00
Christopher Ferris
70e23e0d14 Change wtf errors from ASSERT to ERROR. 
Calling println_native with the value of ASSERT will set the abort
message. Unfortunately, there are numerous cases where one thread aborts,
but before that thread can communicate with debuggerd, another thread
calls wtf, which overwrites the abort message from the original
failing thread.

Fix this by changing this to an error level log message.

Bug: 21490722
(cherry picked from commit 2d073ba83c570466a7f77d1cd9193ab4a60eaee4)

Change-Id: Ib9daedf114a2e0ecc424641e4929cc4d15b0c776
 2015-06-09 17:31:37 -07:00
Stefan Kuhne
e6581b11a9 am 011c133e: Merge "Dont create a dummy animation for a transferred animation" into mnc-dev 
* commit '011c133e3c98ccf95fe4626d30c739c5a35d986e':
  Dont create a dummy animation for a transferred animation
 2015-06-10 00:26:11 +00:00
Fyodor Kupolov
1f6cbb5d76 am c2ae0090: Merge "Do not create profile if FEATURE_MANAGED_USERS is not available" into mnc-dev 
* commit 'c2ae0090d2f6b9f36b4027e79f0430d29853a193':
  Do not create profile if FEATURE_MANAGED_USERS is not available
 2015-06-10 00:26:07 +00:00
Christopher Ferris
1a4b8288ad Merge "Change wtf errors from ASSERT to ERROR." into mnc-dev 2015-06-10 00:25:32 +00:00
Stefan Kuhne
011c133e3c Merge "Dont create a dummy animation for a transferred animation" into mnc-dev 2015-06-10 00:21:49 +00:00
Fyodor Kupolov
c2ae0090d2 Merge "Do not create profile if FEATURE_MANAGED_USERS is not available" into mnc-dev 2015-06-10 00:16:14 +00:00
Dianne Hackborn
098e4bf040 am 45c75dea: am 549aacfe: am 47669522: Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev 
* commit '45c75dea7f1c03e4e899e5316785731b91daf85b':
  Fix issue #21621920: VI: need mechanism to get current request
 2015-06-10 00:14:03 +00:00
Zheng Fu
50ef8f5eb6 Merge "un-hide raw_contacts.backup_id and expose metadatasync to system." 2015-06-10 00:06:04 +00:00
Dianne Hackborn
45c75dea7f am 549aacfe: am 47669522: Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev 
* commit '549aacfe9a299a61b5bc5acc2b776ac545cd855b':
  Fix issue #21621920: VI: need mechanism to get current request
 2015-06-10 00:00:11 +00:00
Erik Kline
35d5f52c28 am baad4077: am 69b0dcab: am 64d6ce8a: Merge "initial revision of NetworkDiagnostics" into mnc-dev 
* commit 'baad4077955905933b9b5a8cdd6e82349cc68c96':
  initial revision of NetworkDiagnostics
 2015-06-10 00:00:10 +00:00
Fyodor Kupolov
b615799504 Do not create profile if FEATURE_MANAGED_USERS is not available 
Bug: 21629701
Change-Id: Ia0f720eee0faa0d565701064a268948f6dea82e4
 2015-06-09 16:51:13 -07:00
Zheng Fu
7997bee366 un-hide raw_contacts.backup_id and expose metadatasync to system. 
Bug:18930508
Change-Id: I37eb7ca41416becb549ebe5b1986925952a943c9
 2015-06-09 16:50:02 -07:00
Erik Kline
baad407795 am 69b0dcab: am 64d6ce8a: Merge "initial revision of NetworkDiagnostics" into mnc-dev 
* commit '69b0dcab4f998886fc5c96d354bebc0e601442ce':
  initial revision of NetworkDiagnostics
 2015-06-09 23:47:34 +00:00
Dianne Hackborn
549aacfe9a am 47669522: Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev 
* commit '476695227393b6c35c6777754b0e3b6448ceb7d2':
  Fix issue #21621920: VI: need mechanism to get current request
 2015-06-09 23:47:23 +00:00
Robin Lee
0eeff6cfc0 am e26ae30e: am 9e46757d: am 63cc6458: Merge "Switch over to updated VPN warning strings" into mnc-dev 
* commit 'e26ae30eeedd8145a021697e9b7e18bb740537c7':
  Switch over to updated VPN warning strings
 2015-06-09 23:40:57 +00:00
Filip Gruszczynski
14d4895285 am 9fcc4981: am 24ebdf9c: am 2bad67b1: am 6974f22d: am 47e53319: Revert "Recompute focus stack if cleared while starting an activity." 
* commit '9fcc4981a9166c8601b04ccacac5616323f0886a':
  Revert "Recompute focus stack if cleared while starting an activity."
 2015-06-09 23:40:51 +00:00
Wale Ogunwale
715b71cee5 am 333839d8: am 36748a43: am d648975f: am 64b586e1: am 0b3d573e: Recompute focus stack if cleared while starting an activity. 
* commit '333839d81347bfc65331fcb0cd0eaf2a3ae7a3cc':
  Recompute focus stack if cleared while starting an activity.
 2015-06-09 23:40:45 +00:00
Luan Nguyen
d0dc4c1c1f am a3bfa390: am 7bfd2d9e: am e44643b1: am 33677f0c: am d8b632fb: Merge "docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs." into mnc-preview-docs 
* commit 'a3bfa3908f9bdf5cb3603968fb32b81d92824fa7':
  docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs.
 2015-06-09 23:40:40 +00:00
Wale Ogunwale
f8a590fad0 am a70c0d7a: am d43ee126: am 2c4643dd: Merge "Fixed issue with using wrong display id when creating context for displays" into mnc-dev 
* commit 'a70c0d7aa1841f593cab3e5639db6e0b469ead47':
  Fixed issue with using wrong display id when creating context for displays
 2015-06-09 23:40:34 +00:00
Dianne Hackborn
4766952273 Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev 2015-06-09 23:33:52 +00:00
Erik Kline
69b0dcab4f am 64d6ce8a: Merge "initial revision of NetworkDiagnostics" into mnc-dev 
* commit '64d6ce8a661fd63b90b4c9f3f7d400208cb2430a':
  initial revision of NetworkDiagnostics
 2015-06-09 23:32:50 +00:00
Robin Lee
e26ae30eee am 9e46757d: am 63cc6458: Merge "Switch over to updated VPN warning strings" into mnc-dev 
* commit '9e46757d857ebdff91a822d4d6313e38f7a81a2d':
  Switch over to updated VPN warning strings
 2015-06-09 23:28:05 +00:00
Filip Gruszczynski
9fcc4981a9 am 24ebdf9c: am 2bad67b1: am 6974f22d: am 47e53319: Revert "Recompute focus stack if cleared while starting an activity." 
* commit '24ebdf9c28586a8a45b120956e952b91b5f71701':
  Revert "Recompute focus stack if cleared while starting an activity."
 2015-06-09 23:28:00 +00:00
Wale Ogunwale
333839d813 am 36748a43: am d648975f: am 64b586e1: am 0b3d573e: Recompute focus stack if cleared while starting an activity. 
* commit '36748a43ae0ab6eeb36f15a3576876a96573e510':
  Recompute focus stack if cleared while starting an activity.
 2015-06-09 23:27:54 +00:00
Luan Nguyen
a3bfa3908f am 7bfd2d9e: am e44643b1: am 33677f0c: am d8b632fb: Merge "docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs." into mnc-preview-docs 
* commit '7bfd2d9e7487a5c68025d9abee00aa138e9702b4':
  docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs.
 2015-06-09 23:27:49 +00:00
Wale Ogunwale
a70c0d7aa1 am d43ee126: am 2c4643dd: Merge "Fixed issue with using wrong display id when creating context for displays" into mnc-dev 
* commit 'd43ee1260e5cd9fb7cd56d38557b494bc475612f':
  Fixed issue with using wrong display id when creating context for displays
 2015-06-09 23:27:44 +00:00
John Reck
ecfa74e256 am 6fb3b3c9: am 8693fc6f: am 475c545f: Merge "Upload bitmaps in SkShader* safely" into mnc-dev 
* commit '6fb3b3c97221057d5758df7abc69362719adfc29':
  Upload bitmaps in SkShader* safely
 2015-06-09 23:23:27 +00:00
Jim Miller
142bd48866 am dfe46032: am 2fb726fe: am 31ed2044: Merge "Add documentation for possible AndroidKeyStore exceptions to authenticate() call" into mnc-dev 
* commit 'dfe46032e7f8dfb66f088a09142024b9e1e9c4a2':
  Add documentation for possible AndroidKeyStore exceptions to authenticate() call
 2015-06-09 23:23:21 +00:00
Chris Craik
d55dee2018 am 64606735: am 57998147: am 751afe20: Merge "Dont ignore layer paint alpha in software path" into mnc-dev 
* commit '646067359634a7f2a6e42096b09329127c0dc225':
  Dont ignore layer paint alpha in software path
 2015-06-09 23:23:16 +00:00
Phil Burk
abc7a28e84 am c01a9a72: am bce8f4d9: am bcdf0dc1: Merge "MIDI docs: use getPorts()" into mnc-dev 
* commit 'c01a9a729429e038dac2499e72868fef5b7223f7':
  MIDI docs: use getPorts()
 2015-06-09 23:23:10 +00:00
Erik Kline
64d6ce8a66 Merge "initial revision of NetworkDiagnostics" into mnc-dev 2015-06-09 23:23:03 +00:00
Tyler Gunn
196ca8b14b am dbd0700f: am f9118d03: am 69c4e2c5: Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev 
* commit 'dbd0700f8e35b3c4ece8320290cf01a6c3fb0946':
  Remove use of STATE_AUDIO_ONLY in a comparison.
 2015-06-09 23:23:02 +00:00
Xiyuan Xia
d880c4bc1e am c7a1d5d6: am 000d5339: am 12149b69: Merge "Add setting for assistant" into mnc-dev 
* commit 'c7a1d5d6e23f1cc0fbe2fb277395792cd6ee1657':
  Add setting for assistant
 2015-06-09 23:22:57 +00:00
Robin Lee
9e46757d85 am 63cc6458: Merge "Switch over to updated VPN warning strings" into mnc-dev 
* commit '63cc6458ace9da6a064f254323fe493618a6c518':
  Switch over to updated VPN warning strings
 2015-06-09 23:21:27 +00:00
Filip Gruszczynski
24ebdf9c28 am 2bad67b1: am 6974f22d: am 47e53319: Revert "Recompute focus stack if cleared while starting an activity." 
* commit '2bad67b16fbfbfa56081bfbd6a43c0b1793ce8a3':
  Revert "Recompute focus stack if cleared while starting an activity."
 2015-06-09 23:21:22 +00:00