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

99339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav
62d595216b am ec695824: Merge "Remove "enhance web scripts" from settings and make it requested by plug-ins." 
# Via Android (Google) Code Review (1) and Svetoslav (1)
* commit 'ec695824af7ab263eaae613b87f2c0b24f176f91':
  Remove "enhance web scripts" from settings and make it requested by plug-ins.
 2013-01-30 21:40:20 -08:00
Svetoslav
ec695824af Merge "Remove "enhance web scripts" from settings and make it requested by plug-ins." 2013-01-31 03:16:59 +00:00
Xia Wang
4ec772af96 am c5401d44: am 63d25816: am 599f9611: am f3ef10b1: am 2297d1e7: Merge "Fix WiFi test:" into jb-mr1.1-dev 
# Via Android Git Automerger (4) and others
* commit 'c5401d4451dfb5edb627a35c1d3ad90cbcef77a1':
  Fix WiFi test:
 2013-01-30 19:05:22 -08:00
Xia Wang
c5401d4451 am 63d25816: am 599f9611: am f3ef10b1: am 2297d1e7: Merge "Fix WiFi test:" into jb-mr1.1-dev 
# Via Android Git Automerger (3) and others
* commit '63d258167637309c0c85725ecc9112a88bf57824':
  Fix WiFi test:
 2013-01-30 19:03:39 -08:00
Xia Wang
63d2581676 am 599f9611: am f3ef10b1: am 2297d1e7: Merge "Fix WiFi test:" into jb-mr1.1-dev 
# Via Android Git Automerger (2) and others
* commit '599f9611aab587d13b4d7bac94fc628c675591a1':
  Fix WiFi test:
 2013-01-30 19:01:14 -08:00
Xia Wang
599f9611aa am f3ef10b1: am 2297d1e7: Merge "Fix WiFi test:" into jb-mr1.1-dev 
# Via Android (Google) Code Review (1) and others
* commit 'f3ef10b12b61891962eb6253e95c8c9eec82d383':
  Fix WiFi test:
 2013-01-30 18:59:22 -08:00
Xia Wang
f3ef10b12b am 2297d1e7: Merge "Fix WiFi test:" into jb-mr1.1-dev 
# Via Android (Google) Code Review (1) and Xia Wang (1)
* commit '2297d1e78cc70d4e19d9e7c66d24fc494455166c':
  Fix WiFi test:
 2013-01-30 18:57:50 -08:00
Xia Wang
2297d1e78c Merge "Fix WiFi test:" into jb-mr1.1-dev 2013-01-31 02:54:56 +00:00
Xia Wang
f2991add02 Fix WiFi test: 
-- In environment where there are too many APs, sometimes, the AP will not show in the scan list.
    Part of the reason is due to the change that the scanning on each frequency is shortened to save power.
    to avoid that, change the test to connect without scanning.

 -- Increase the timer to wait for WiFi to be connected

Change-Id: If1a72607b3c7ad13dbbf788607665986eaf5b6b3
 2013-01-30 18:52:27 -08:00
Jeff Sharkey
199a2b57b0 am ed1ad7fa: Merge "Add wrapping support to IndentingPrintWriter." 
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit 'ed1ad7fadae1ed0fae2946dbe3e3ee9eea299bde':
  Add wrapping support to IndentingPrintWriter.
 2013-01-30 16:40:57 -08:00
Jeff Sharkey
ed1ad7fada Merge "Add wrapping support to IndentingPrintWriter." 2013-01-31 00:37:34 +00:00
Jeff Sharkey
71cb446f01 Add wrapping support to IndentingPrintWriter. 
When created with a wrapping width, any content longer than the
requested width will be wrapped onto additional lines.  This supports
use-cases like dumping lots of data with printPair().

Improve documentation and add tests to verify behavior.

Change-Id: Ibdfce198f0e69f4df7725544fd1cd02fa029c647
 2013-01-30 16:35:35 -08:00
Wink Saville
32ee0fb2e3 am 75d880df: Merge "Revert "Clean up published network condition reporting."" 
# Via Android (Google) Code Review
* commit '75d880dfb0bb1342bce0b0337c7ae752d75ff1b6':
  Revert "Clean up published network condition reporting."
 2013-01-30 16:35:21 -08:00
Wink Saville
75d880dfb0 Merge "Revert "Clean up published network condition reporting."" 2013-01-31 00:32:36 +00:00
Romain Guy
0f72747c27 am 984add52: Merge "Return a copy of the read-only identity Matrix" 
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit '984add522ed1b2ce351fc2ee5a9d478d9ee9312f':
  Return a copy of the read-only identity Matrix
 2013-01-30 16:30:48 -08:00
Todd Poynor
b10c0f97e9 am afae9d24: Merge "BatteryService: Treat USB charging ports and charging accessories as AC" 
# Via Android (Google) Code Review (1) and Todd Poynor (1)
* commit 'afae9d248ade0cb0b719f680804acfb9d20ca36b':
  BatteryService: Treat USB charging ports and charging accessories as AC
 2013-01-30 16:30:44 -08:00
Todd Poynor
79e1df27b3 am b86d026a: Merge "BatteryService: Allow power supplies to switch type between AC and USB" 
# Via Android (Google) Code Review (1) and Todd Poynor (1)
* commit 'b86d026a7f4108caefa080cf9e0c0b4b5e275a84':
  BatteryService: Allow power supplies to switch type between AC and USB
 2013-01-30 16:30:41 -08:00
Wink Saville
5b7573e835 Revert "Clean up published network condition reporting." 
In some cases causes grey ICON's.

This reverts commit 82413d0b2acad73b9a008e0c53392a54f9555cf8

Change-Id: I09f893d03651c3fb9fcb88ee9e5ac7ce6cb6e273
 2013-01-31 00:30:13 +00:00
Romain Guy
984add522e Merge "Return a copy of the read-only identity Matrix" 2013-01-31 00:27:57 +00:00
Romain Guy
5370405db2 Return a copy of the read-only identity Matrix 
An app trying to modify the returned matrix (despite what the
documentation says...) would crash when the matrix is identity.

Change-Id: I8aae06b712907085088fb9f0321352dd2c3462ac
 2013-01-30 16:25:50 -08:00
Todd Poynor
afae9d248a Merge "BatteryService: Treat USB charging ports and charging accessories as AC" 2013-01-30 23:20:18 +00:00
Todd Poynor
b86d026a7f Merge "BatteryService: Allow power supplies to switch type between AC and USB" 2013-01-30 23:19:40 +00:00
Todd Poynor
78d8fe4bd6 BatteryService: Treat USB charging ports and charging accessories as AC 
Change-Id: If98330b09a1fc44992bb96195804d434a4e20470
 2013-01-30 14:24:12 -08:00
Baligh Uddin
9b34686d2f am b20abf41: (-s ours) Merge "Import translations. DO NOT MERGE" 
# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit 'b20abf4132d2d2e30efcfd831d0c619101a0592e':
  Import translations. DO NOT MERGE
 2013-01-30 12:10:06 -08:00
Wink Saville
a1a2060a89 am d21e24bc: Merge "Cleanup StateMachine LogRec handling and get tests working." 
# Via Android (Google) Code Review (1) and Wink Saville (1)
* commit 'd21e24bccec8309839a264da95c5dc1573fc65c3':
  Cleanup StateMachine LogRec handling and get tests working.
 2013-01-30 12:10:03 -08:00
Baligh Uddin
8390ebcd4e am 911b78e1: (-s ours) Merge "Import translations. DO NOT MERGE" 
# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit '911b78e1593fe7cc40dba5ba47e3f7cc234e1010':
  Import translations. DO NOT MERGE
 2013-01-30 12:10:00 -08:00
Dianne Hackborn
f5667b4612 am e918d2e5: Merge "Improve revoking access to content providers." 
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit 'e918d2e59db0c29127a672dc744413e4390b37d3':
  Improve revoking access to content providers.
 2013-01-30 12:09:56 -08:00
Jeff Sharkey
888b15fbcc am 1410db83: Merge "Check text length when testing for newline." 
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit '1410db83f97bf69a1a461cc20fd6d5b7b0ef08c0':
  Check text length when testing for newline.
 2013-01-30 12:09:52 -08:00
Derek Sollenberger
7fc9756f28 Merge "resolved conflicts for merge of c93c6aa5 to master-chromium" into master-chromium 2013-01-30 20:07:31 +00:00
Baligh Uddin
b20abf4132 Merge "Import translations. DO NOT MERGE" 2013-01-30 19:52:02 +00:00
Baligh Uddin
4607c3a964 Merge "Import translations. DO NOT MERGE" into master-chromium 2013-01-30 19:45:54 +00:00
Wink Saville
d21e24bcce Merge "Cleanup StateMachine LogRec handling and get tests working." 2013-01-30 19:44:16 +00:00
Baligh Uddin
911b78e159 Merge "Import translations. DO NOT MERGE" 2013-01-30 19:42:56 +00:00
Derek Sollenberger
2dbd185fd0 resolved conflicts for merge of c93c6aa5 to master-chromium 
Change-Id: I51429ed5359355025f873ccab11bfabbbe772a46
 2013-01-30 14:32:29 -05:00
Todd Poynor
701bfb1034 BatteryService: Allow power supplies to switch type between AC and USB 
Accomodate power_supply drivers that switch between MAINS and USB type
according to the current power source.  Re-read the type attribute when the
power supply is online.

Switch to String8 type for strings stored locally.

Change-Id: Iacce49bf3ad85f35a7295a54df43aff7f94f3100
 2013-01-30 11:24:56 -08:00
Wink Saville
efcc3d3566 Cleanup StateMachine LogRec handling and get tests working. 
Change-Id: I13107e846812b16f1c95be11626500dbd7a13b2a
 2013-01-30 11:21:22 -08:00
Dianne Hackborn
e918d2e59d Merge "Improve revoking access to content providers." 2013-01-30 19:09:16 +00:00
Jeff Sharkey
1410db83f9 Merge "Check text length when testing for newline." 2013-01-30 19:03:33 +00:00
Jeff Sharkey
3029bf225c Check text length when testing for newline. 
Also add tests to verify.

Bug: 8102140
Change-Id: I7e5dbff53caeb50bfa0fb4ea5dce73e3c742986a
 2013-01-30 11:01:12 -08:00
Chris Craik
c93c6aa555 Merge "Object-based DisplayList recording" 2013-01-30 18:42:56 +00:00
Nick Kralevich
1de9023190 am cae3d9f0: ZygoteInit: more dead code cleanup 
# Via Nick Kralevich
* commit 'cae3d9f0ab2756e3659efc7a08830d2d7b43a05e':
  ZygoteInit: more dead code cleanup
 2013-01-30 10:10:43 -08:00
Nick Kralevich
cae3d9f0ab ZygoteInit: more dead code cleanup 
ZYGOTE_FORK_MODE has been set to false since 2009, and the
code indicates that runForkMode() was "retained for reference only."
Remove this dead code. There will always be a reference to this code
in git.

Change-Id: Iddfdca8379fdc6521febea81e553de763b6f4fd0
 2013-01-30 10:01:51 -08:00
Nick Kralevich
c906166161 am 4ec799d4: Merge "Remove dead code." 
# Via Android (Google) Code Review (1) and Nick Kralevich (1)
* commit '4ec799d4c6de7e626363659508f21ee5c3c173aa':
  Remove dead code.
 2013-01-30 10:00:48 -08:00
Nick Kralevich
4ec799d4c6 Merge "Remove dead code." 2013-01-30 17:57:45 +00:00
Nick Kralevich
ce35bf7934 am de3c6088: Merge "ZygoteConnection.java: Remove dead code --peer-wait" 
# Via Android (Google) Code Review (1) and Nick Kralevich (1)
* commit 'de3c608864be0fece8a27ef9cca8fac8b5292f5b':
  ZygoteConnection.java: Remove dead code --peer-wait
 2013-01-30 09:53:52 -08:00
Nick Kralevich
de3c608864 Merge "ZygoteConnection.java: Remove dead code --peer-wait" 2013-01-30 17:47:55 +00:00
Nick Kralevich
40779e50f0 Remove dead code. 
Setting capabiltities is handled by dalvik. This code
is never called.

Change-Id: I903952c43cf60ea59ec954c9168a7604d05ccaf7
 2013-01-30 09:29:15 -08:00
Baligh Uddin
2df86316a3 Import translations. DO NOT MERGE 
Change-Id: Ie7f5b90ff75d3ee01dbfd824cf6b3d7ecb4c2c9b
Auto-generated-cl: translation import
 2013-01-30 09:24:43 -08:00
Baligh Uddin
cd9bccc577 Import translations. DO NOT MERGE 
Change-Id: I49ef5dc470755aef0901d4975f250680de056a66
Auto-generated-cl: translation import
 2013-01-30 09:12:38 -08:00
Baligh Uddin
d4d51a35a0 Import translations. DO NOT MERGE 
Change-Id: I513162783e8b9b378765f59cb58d7fd30de66092
Auto-generated-cl: translation import
 2013-01-30 09:11:14 -08:00