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

65086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
9c9b9adbfa docs: Update lifecycle diagrams to use new omnigraffle designs; 
add corresponding graffle files
update discussion of activity state restore for clarification

Change-Id: I7c6a68b627b35d0b648fac071a06960a7e833686
 2012-01-03 18:27:23 -08:00
Christopher Tate
b070ff8cde am 20eaf4c1: am 91582b86: am 30ad699c: Merge "Tweak docs on \'adb logcat\'" into ics-mr1 
* commit '20eaf4c1a41ee56998086769122917b016181630':
  Tweak docs on 'adb logcat'
 2012-01-03 17:46:20 -08:00
Christopher Tate
20eaf4c1a4 am 91582b86: am 30ad699c: Merge "Tweak docs on \'adb logcat\'" into ics-mr1 
* commit '91582b86d918b80158654671933cf26c96c34747':
  Tweak docs on 'adb logcat'
 2012-01-03 17:44:09 -08:00
Christopher Tate
91582b86d9 am 30ad699c: Merge "Tweak docs on \'adb logcat\'" into ics-mr1 
* commit '30ad699c0e246ef3889f691361758235ecb89895':
  Tweak docs on 'adb logcat'
 2012-01-03 17:40:53 -08:00
Christopher Tate
30ad699c0e Merge "Tweak docs on 'adb logcat'" into ics-mr1 2012-01-03 17:38:51 -08:00
Elliott Hughes
6746499f12 Fix Music import for Turkish locales. 
For non-localized strings like the keywords in SQL statements, we shouldn't use
locale-specific case transformations.

(Cherry pick of 03f8f84c345e7c861a6de889d434b9d82cf04c8d.)

Bug: 4284951
Change-Id: Ib5180daf7892af7b645c906fdfeacf9da87bd667
 2012-01-03 17:20:38 -08:00
Christopher Tate
1df51c65ea Tweak docs on 'adb logcat' 
* Add description of 'threadtime' output format
* Remove description of highly-confusing and never-used 'thread' output format
* Adjust language slightly

Change-Id: I2dcc8b7e5e8c039659697e90d7a4b3746b9135e9
 2012-01-03 16:50:50 -08:00
Scott Main
c8b6346656 am 1ad47b47: am f65320a2: am 12d9954d: docs: dasboard update for 1/3/12 
* commit '1ad47b47bcd9f399db91e633e264a0d40a9948a3':
  docs: dasboard update for 1/3/12
 2012-01-03 16:34:25 -08:00
Romain Guy
0c16df2b20 am 173ab4d6: Merge "Properly restore the GL scissor after a GL draw functor Bug #5781254" 
* commit '173ab4d61077c49f115b82eff34f97fda5a7273a':
  Properly restore the GL scissor after a GL draw functor Bug #5781254
 2012-01-03 16:34:23 -08:00
Danielle Millett
36bf6e353b am 3c673732: Merge "Fix 5783857: Device Policy Manager doesn\'t allow Face Unlock" 
* commit '3c673732ead2721c564c2bd46780e8ebf10e948b':
  Fix 5783857: Device Policy Manager doesn't allow Face Unlock
 2012-01-03 16:34:19 -08:00
Brian Colonna
4a0f26e7aa am dd13756f: Merge "Added padding to PIN layout status and carrier text" 
* commit 'dd13756fdcfe3b254ef052b3c983a9bc28ba5520':
  Added padding to PIN layout status and carrier text
 2012-01-03 16:34:17 -08:00
Brian Colonna
b0f97204a6 am edcac2aa: Merge "Unbinding from FU when going to backup" 
* commit 'edcac2aa695b2cd774ecc8deaa78c363b227b45b':
  Unbinding from FU when going to backup
 2012-01-03 16:34:15 -08:00
Scott Main
1ad47b47bc am f65320a2: am 12d9954d: docs: dasboard update for 1/3/12 
* commit 'f65320a2743e81ae1cb62f2dbf60b65a122b9ddb':
  docs: dasboard update for 1/3/12
 2012-01-03 16:00:28 -08:00
Scott Main
f65320a274 am 12d9954d: docs: dasboard update for 1/3/12 
* commit '12d9954d198d29da1a15ba2c6947ce91839cbb83':
  docs: dasboard update for 1/3/12
 2012-01-03 15:58:41 -08:00
Scott Main
12d9954d19 docs: dasboard update for 1/3/12 
Change-Id: Ie584d9ee238b6d4a37c25dd7e30b0cf493cbfe47
 2012-01-03 15:45:00 -08:00
Wink Saville
81fa7f305b Add support of dislaying Alpha tag for BIP commands 
While BIP data call setup is still handled in RIL/Modem,
this patch is adding support of Alpha tag display on UI.
Alpha tag is optionally included in "OPEN Channel", "Close Channel",
"Send Data" or "Receive Data" command.

"Open channel" will be notified via RIL_UNSOL_STK_PROACTIVE_COMMAND
which requires TERMINAL RESPONSE based on user input.
"Close channel", "Send Data" and "Receive Data" commands
are send via RIL_UNSOL_STK_EVENT_NOTIFY just to display
transient notice.

Bug:5165510
Change-Id: I873e55274c860886bc816ce6fb07cb882d339214
 2012-01-03 15:06:15 -08:00
Steve Block
5baa3a62a9 Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
 2012-01-03 22:38:27 +00:00
Romain Guy
173ab4d610 Merge "Properly restore the GL scissor after a GL draw functor Bug #5781254" 2012-01-03 14:21:18 -08:00
Romain Guy
82bc7a7727 Properly restore the GL scissor after a GL draw functor 
Bug #5781254

Change-Id: I1dc4809563a793b6b579814951d4d73b4c34bf32
 2012-01-03 14:14:55 -08:00
Danielle Millett
3c673732ea Merge "Fix 5783857: Device Policy Manager doesn't allow Face Unlock" 2012-01-03 13:44:28 -08:00
Brian Colonna
dd13756fdc Merge "Added padding to PIN layout status and carrier text" 2012-01-03 13:43:07 -08:00
Brian Colonna
edcac2aa69 Merge "Unbinding from FU when going to backup" 2012-01-03 13:42:17 -08:00
Jeff Sharkey
4ae9ec345f am b8f90a0e: Merge "Test the correct return code from call to cryptfs." 
* commit 'b8f90a0e6eae582778bbe10b6347acbf5fc69bfb':
  Test the correct return code from call to cryptfs.
 2012-01-03 10:59:12 -08:00
Jeff Sharkey
b8f90a0e6e Merge "Test the correct return code from call to cryptfs." 2012-01-03 10:57:19 -08:00
Dirk Dougherty
a4daa7d32c am 478e45be: am 27d2a07a: am a17e100b: Doc change: fix link target for "Publish" icon. 
* commit '478e45be576a08567333e4846ee80de11acfdfb6':
  Doc change: fix link target for "Publish" icon.
 2012-01-03 10:39:52 -08:00
Dirk Dougherty
478e45be57 am 27d2a07a: am a17e100b: Doc change: fix link target for "Publish" icon. 
* commit '27d2a07a5548e238863135280b706751764ef20f':
  Doc change: fix link target for "Publish" icon.
 2012-01-03 10:37:48 -08:00
Dirk Dougherty
27d2a07a55 am a17e100b: Doc change: fix link target for "Publish" icon. 
* commit 'a17e100b7a192cae3935d2ae144fb1a1115a4ca7':
  Doc change: fix link target for "Publish" icon.
 2012-01-03 10:35:18 -08:00
Dirk Dougherty
a17e100b7a Doc change: fix link target for "Publish" icon. 
Change-Id: Iafc8db7e9ad7c42e5e2a1eaed2fb5b93a53e56f9
 2012-01-03 10:09:29 -08:00
Ben Murdoch
c56d1a011b am 2853041e: Merge "Do not allow file:// access when it is disabled." 
* commit '2853041e6a5b848824a4e518a5d41cb334855302':
  Do not allow file:// access when it is disabled.
 2012-01-03 02:56:27 -08:00
Ben Murdoch
2853041e6a Merge "Do not allow file:// access when it is disabled." 2012-01-03 02:53:58 -08:00
Wink Saville
d7a6d73e1d am e7f2cafc: Merge "Separate SIM states from Radio states" 
* commit 'e7f2cafc172e0671a40e46ce86107c50d884af1f':
  Separate SIM states from Radio states
 2011-12-29 16:43:21 -08:00
Wink Saville
e7f2cafc17 Merge "Separate SIM states from Radio states" 2011-12-29 16:41:09 -08:00
Naveen Kalla
fc2cbe9b46 Separate SIM states from Radio states 
Radio state reflects the state of the modem. SIM_READY, RUIM_READY,
NV_READY are subscription states and it is possible that the new cards
have multiple subscriptions. Remove the SIM states from Radio State and
introduce a new VOICE_RADIO_TECH message to identify the exact voice
technology. SIM states will continue to be identified from the
SIM_STATUS messages.

Change-Id: Ia67d54f43b6c3340d9cf5c27fcb6f7ef49ef4d40
 2011-12-29 15:08:20 -08:00
Eric Fischer
cab9be0cc4 am 40da0486: Merge "Import revised translations." 
* commit '40da0486f88ff64a0b8a101764cf551503407634':
  Import revised translations.
 2011-12-29 14:48:30 -08:00
Eric Fischer
40da0486f8 Merge "Import revised translations." 2011-12-29 14:46:50 -08:00
Eric Fischer
6f32f87717 Import revised translations. 
Change-Id: Idaec3a909e2edb46d7f3409947c8329210befcae
 2011-12-29 11:46:43 -08:00
Alex Sakhartchouk
5b5664af2d Adding better error behavior to RS 
Change-Id: Iea1cc76793f8978d60575404d7b1c5145e268d6e
 2011-12-29 11:17:38 -08:00
Irfan Sheriff
2d935c4ad2 am 7db0d041: Merge "Add multi-interface support to native calls" 
* commit '7db0d0411266e29302aadfe1f64209628c586a93':
  Add multi-interface support to native calls
 2011-12-29 09:13:31 -08:00
Irfan Sheriff
7db0d04112 Merge "Add multi-interface support to native calls" 2011-12-29 09:11:29 -08:00
Chia-chi Yeh
52470b47bc am a650639d: Merge "SipService: grab Wi-Fi lock only when necessary." 
* commit 'a650639d5bddf13e949c8ff9d2d14f9e16afc571':
  SipService: grab Wi-Fi lock only when necessary.
 2011-12-28 15:16:41 -08:00
Chia-chi Yeh
a650639d5b Merge "SipService: grab Wi-Fi lock only when necessary." 2011-12-28 15:14:23 -08:00
Chia-chi Yeh
c2bd6162ed SipService: grab Wi-Fi lock only when necessary. 
Change-Id: Ie432049156e70b6748426b959b653f21bfc504a1
 2011-12-28 15:11:04 -08:00
Irfan Sheriff
8df2a15044 am 2f0d941b: Merge "clean up jni code" 
* commit '2f0d941b5df25e2dc857daad445bc69e1e1129d2':
  clean up jni code
 2011-12-28 13:57:38 -08:00
Irfan Sheriff
2f0d941b5d Merge "clean up jni code" 2011-12-28 13:55:19 -08:00
Alex Sakhartchouk
36a7d6003d Adding RS comments, cleaning up the gl implementation with new Element hal. 
Change-Id: I74de1e8248a73a45a39976e6027dac2626d580e9
 2011-12-28 13:47:05 -08:00
Irfan Sheriff
44b330dfb0 Add multi-interface support to native calls 
Add the initial support for supporting seperate socket
connections on the p2p interface.

This is the initial change making primary interface connections
work alongside native support for p2p socket connection

Change-Id: I7619715ca75b10afd29af852279fe713331f75e0
 2011-12-28 13:25:14 -08:00
Irfan Sheriff
1f09586953 clean up jni code 
- Move all supplicant commands out of jni code in preparation for multi-socket
changes

- Also, clean up some function names to remove the explicit command

Change-Id: Id609ac7df0792fb85b52554d159f22064227c584
 2011-12-28 13:18:07 -08:00
Scott Main
25376b633f am 085ab36c: am e231cd0a: am 0582da68: docs: add links for Galaxy Nexus driver 
* commit '085ab36cc9d8f0bf102572d69d13f62497f32a90':
  docs: add links for Galaxy Nexus driver
 2011-12-28 10:38:01 -08:00
Scott Main
085ab36cc9 am e231cd0a: am 0582da68: docs: add links for Galaxy Nexus driver 
* commit 'e231cd0a0dd5fce60a0635d7a60233db432429dd':
  docs: add links for Galaxy Nexus driver
 2011-12-28 10:36:01 -08:00
Scott Main
e231cd0a0d am 0582da68: docs: add links for Galaxy Nexus driver 
* commit '0582da680ed3d48bfd9d6ed550f39aa2177baf79':
  docs: add links for Galaxy Nexus driver
 2011-12-28 10:34:03 -08:00