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

180742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
8ac90a0609 Avoid ripple buffer creation for empty bounds automerge: b74155c automerge: e6e216c 
automerge: 2aacb86

* commit '2aacb861f4c7b80c5d2bb22956c9a5d4ace4df67':
  Avoid ripple buffer creation for empty bounds
 2015-01-21 21:13:33 +00:00
Alan Viverette
2aacb861f4 Avoid ripple buffer creation for empty bounds automerge: b74155c 
automerge: e6e216c

* commit 'e6e216c48ea25bdbc2d0a262c74670fb6513e42b':
  Avoid ripple buffer creation for empty bounds
 2015-01-21 21:09:39 +00:00
Alan Viverette
e6e216c48e Avoid ripple buffer creation for empty bounds 
automerge: b74155c

* commit 'b74155cf01f959fc9b7909de5a22806ad519f7c9':
  Avoid ripple buffer creation for empty bounds
 2015-01-21 21:02:58 +00:00
Jim Miller
b5db57a27d Clarify getTrustAgentConfiguration() documentation. 
Fixes bug 18983802

Change-Id: I2f6e208cdd4fac95d1d0228bec3de8199baafa57
 2015-01-21 21:01:02 +00:00
Jason Monk
17f3c3f4fb Show connect dialog when selecting secure QS wifi 
Use startSettingsActivity (QSTileHost) to make sure we use the right flags
and get the keyguard out of the way so the user always sees the
connect dialog for secure networks when they are sent to settings.

Bug: 18987307
Change-Id: I9027393ab8743e6dfe702221cb3bc1bb4e213708
 2015-01-21 20:58:47 +00:00
Alan Viverette
b74155cf01 Avoid ripple buffer creation for empty bounds 
Bug: 19068439
Change-Id: I031d4303bbf101a25612dce6f02d81ce4cf58e2b
 2015-01-21 12:30:49 -08:00
Mike Lockwood
767cddd3dd Merge "Watch for NumberFormatExceptions in AlsaCardsParser and AlsaDevicesParser" 2015-01-21 20:09:51 +00:00
Robert Greenwalt
fe0e33495c am b73f431d: Merge "Add + code handling logic for SMS Global Roaming" automerge: f19176f 
automerge: 52f25f7

* commit '52f25f7b30b684a46814cff60538e6a7636ed618':
  Add + code handling logic for SMS Global Roaming
 2015-01-21 20:05:30 +00:00
Robert Greenwalt
52f25f7b30 am b73f431d: Merge "Add + code handling logic for SMS Global Roaming" automerge: f19176f 
* commit 'b73f431dddc0ba9260a342f2322e818460cf6f34':
  Add + code handling logic for SMS Global Roaming
 2015-01-21 20:01:50 +00:00
Robert Greenwalt
b73f431ddd Merge "Add + code handling logic for SMS Global Roaming" 
automerge: f19176f

* commit 'f19176ff2f1deb672172f953626fabc45304d435':
  Add + code handling logic for SMS Global Roaming
 2015-01-21 19:56:25 +00:00
Robert Greenwalt
f19176ff2f Merge "Add + code handling logic for SMS Global Roaming" 2015-01-21 19:52:21 +00:00
Andrew Solovay
78f4342fac Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs 2015-01-21 19:20:58 +00:00
Mike Lockwood
a1329aebe7 Watch for NumberFormatExceptions in AlsaCardsParser and AlsaDevicesParser 
Bug: 19082426
Change-Id: I130d4df290716339326a28d249217a8a04220176
 2015-01-21 11:11:14 -08:00
Dianne Hackborn
4b94649ce3 Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev automerge: 2132695 automerge: 5346a21 
automerge: f6b4b1a

* commit 'f6b4b1a43253d5ea94763cf9750224c7b7b618c0':
  Work on issue #18201239: ANRs in com.google.process.gapps:
 2015-01-21 19:00:55 +00:00
Dianne Hackborn
f6b4b1a432 Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev automerge: 2132695 
automerge: 5346a21

* commit '5346a21bad95796611760d40c1540d1659038216':
  Work on issue #18201239: ANRs in com.google.process.gapps:
 2015-01-21 18:55:12 +00:00
Dianne Hackborn
5346a21bad Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev 
automerge: 2132695

* commit '213269599bdec3d83d3d811f5e8f62b9fd8d245c':
  Work on issue #18201239: ANRs in com.google.process.gapps:
 2015-01-21 18:47:11 +00:00
Svetoslav
220dbc4a7f AlertActivity now behaves as a dialog for accessibility purposes. automerge: 76ff4dd automerge: 03944ce 
automerge: 2b2b1a9

* commit '2b2b1a9b890f40fd24bce27580d3124c2c98f373':
  AlertActivity now behaves as a dialog for accessibility purposes.
 2015-01-21 18:43:41 +00:00
Dianne Hackborn
213269599b Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev 2015-01-21 18:41:38 +00:00
Svetoslav
2b2b1a9b89 AlertActivity now behaves as a dialog for accessibility purposes. automerge: 76ff4dd 
automerge: 03944ce

* commit '03944ce664c733d1922247229fc56f6630c0a5e4':
  AlertActivity now behaves as a dialog for accessibility purposes.
 2015-01-21 18:39:34 +00:00
Svetoslav
03944ce664 AlertActivity now behaves as a dialog for accessibility purposes. 
automerge: 76ff4dd

* commit '76ff4dd0de8d9747b9341f064dd270c5762705c6':
  AlertActivity now behaves as a dialog for accessibility purposes.
 2015-01-21 18:31:46 +00:00
Svetoslav
76ff4dd0de AlertActivity now behaves as a dialog for accessibility purposes. 
AlertActivity is intended to look like a dialog but for accessibility
purposes it was populated as an activity. As a result the content of
the "dialog" was not properly announced to the user.

bug:18865632

Change-Id: I27166fc74678981f4f3ad71d6d25727b5110340c
 2015-01-21 18:28:03 +00:00
Paul Jensen
c4c7231eb6 Clear VPN config when VPN disconnects. 
This ensures ConnectivityService.getVpnConfig() returns null after a
VPN disconnects.

bug:18640307
Change-Id: I2238eabaf665cad0a4f4258add57611f2b450089
 2015-01-21 18:08:15 +00:00
Dianne Hackborn
455625e298 Work on issue #18201239: ANRs in com.google.process.gapps: 
Reason: Executing service com.google.android.syncadapters.contacts
/.SyncHighResPhotoIntentService

Make the code more robust when destroying services, so that if
the nesting count gets out of sync we don't just hang.

Change-Id: If117d5ef242e7c148fd9576bd89a1a092583d6ad
 2015-01-21 09:55:13 -08:00
Nicolas Prevot
daf92066db Never set "Work" or "Personal apps" as prefered activities. 
In ResolverActivity: when the user chooses work or personal:
Do not set them as prefered activities.

BUG:19091836

Change-Id: Ibe0081eb16e58cc25decb3f25b7fd50b5403d5fc
 2015-01-21 17:53:11 +00:00
Craig Mautner
9ba23db50c Merge "[ActivityManager] No home activity resumed and cause key dispatch ANR" automerge: 247e828 automerge: ad55787 
automerge: 7748fd8

* commit '7748fd81350ba2db9864527281d62fbf02a90145':
  [ActivityManager] No home activity resumed and cause key dispatch ANR
 2015-01-21 17:17:18 +00:00
Craig Mautner
7748fd8135 Merge "[ActivityManager] No home activity resumed and cause key dispatch ANR" automerge: 247e828 
automerge: ad55787

* commit 'ad55787db2f9e4b56a8406026566564d6aa08d5a':
  [ActivityManager] No home activity resumed and cause key dispatch ANR
 2015-01-21 17:09:30 +00:00
Craig Mautner
ad55787db2 Merge "[ActivityManager] No home activity resumed and cause key dispatch ANR" 
automerge: 247e828

* commit '247e828b5cd63efeae3226c2a9d3bd1f466141dc':
  [ActivityManager] No home activity resumed and cause key dispatch ANR
 2015-01-21 17:04:26 +00:00
Craig Mautner
247e828b5c Merge "[ActivityManager] No home activity resumed and cause key dispatch ANR" 2015-01-21 17:01:02 +00:00
Kenny Guy
a526a1e78c Flush and sync before calling JournaledFile.commit 
JournaledFile.commit on ext4 isn't atomic you need
to flush / sync before closing the file otherwise
you might end up with an empty file.

Bug: 19091744
Change-Id: Ia04784084053cc8ce338a13a61dc6d397610a006
 2015-01-21 16:52:01 +00:00
Geoff Mendal
d7211ef8bc Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: bae67d3 -s ours 
automerge: 893e388  -s ours

* commit '893e388fc3406da103733584474e88950ea8ab25':
  Import translations. DO NOT MERGE
 2015-01-21 16:40:45 +00:00
Geoff Mendal
893e388fc3 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: bae67d3  -s ours

* commit 'bae67d30304853ce3898b922ab0753718c89f82c':
  Import translations. DO NOT MERGE
 2015-01-21 16:35:14 +00:00
Geoff Mendal
bae67d3030 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-01-21 16:32:07 +00:00
Jorim Jaggi
ab75f63787 Merge "Remove dead code #12: Remove KeyButtonView.quiescentAlpha" 2015-01-21 16:32:03 +00:00
Geoff Mendal
66f4901bc8 Merge "Import translations. DO NOT MERGE" 2015-01-21 16:31:32 +00:00
Kenny Guy
2e0072d730 Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev automerge: 06ab0ca automerge: 11c4cc1 
automerge: 3458e18

* commit '3458e180cf1dab2be19d00758b64033061aa62d2':
  Only hide cross profile disclosure when showing resolver.
 2015-01-21 16:30:22 +00:00
Jorim Jaggi
b1b085a055 Remove dead code #12: Remove KeyButtonView.quiescentAlpha 
Change-Id: I5e22da13f61fda78d1ea2fec2e89252a82f98e21
 2015-01-21 17:25:27 +01:00
Kenny Guy
3458e180cf Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev automerge: 06ab0ca 
automerge: 11c4cc1

* commit '11c4cc196de9dca3bfad711b1b9e4b779a72cc01':
  Only hide cross profile disclosure when showing resolver.
 2015-01-21 16:24:01 +00:00
Luan Nguyen
f082f8980e Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs 2015-01-21 16:19:20 +00:00
Kenny Guy
11c4cc196d Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev 
automerge: 06ab0ca

* commit '06ab0ca4812450ec297722957e18b34cbfa733b2':
  Only hide cross profile disclosure when showing resolver.
 2015-01-21 16:17:03 +00:00
Geoff Mendal
0b953a1267 Import translations. DO NOT MERGE 
Change-Id: Icfb7c61dc2e280254ec926c2b706ba2d7dd1273a
Auto-generated-cl: translation import
 2015-01-21 08:14:22 -08:00
Kenny Guy
06ab0ca481 Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev 2015-01-21 16:13:24 +00:00
Geoff Mendal
f7495fc0db Import translations. DO NOT MERGE 
Change-Id: I5e52f16f3fc37f4f4a34f23de9390da819ca1ae9
Auto-generated-cl: translation import
 2015-01-21 08:07:21 -08:00
Luan Nguyen
46e804d2a7 docs: Fix conditional in ambient mode check method (18832168). 
Fix issue with non existent variable (18832287).
Fix issue with outdated instructions (18832293).
Fix issue with misleading time tick (18832171).

bug: 18832168
bug: 18832171
bug: 18832287
bug: 18832293
Change-Id: I4f071846589ba7edda500342ccd5fac6ecca3161
 2015-01-21 08:00:45 -08:00
Jorim Jaggi
b93024f1e8 Remove dead code #10: Clean up PhoneStatusBar 
- Remove carrier label
- Remove emergency calls only label
- Remove dead methods and fiels.

Change-Id: If242a8fa926d21d77fc54867f4244e7d82626fff
 2015-01-21 16:56:58 +01:00
Jorim Jaggi
2325f276cf Remove dead code #9: Remove ticker code in PhoneStatusBar 
Change-Id: I2236790435d89962d70c642fa1879d44981bc71b
 2015-01-21 16:56:33 +01:00
Geoff Mendal
318bc929a5 Merge "Import translations. DO NOT MERGE" 2015-01-21 15:37:00 +00:00
Geoff Mendal
5afaeb6183 Import translations. DO NOT MERGE 
Change-Id: I01111253b2616daa695fdc071b875033e3badceb
Auto-generated-cl: translation import
 2015-01-21 07:33:21 -08:00
Geoff Mendal
5eaa1f952f Merge "Import translations. DO NOT MERGE" 2015-01-21 15:31:49 +00:00
Geoff Mendal
ae0b0167bc Import translations. DO NOT MERGE 
Change-Id: I03276ec800985dbd5519945587620f52d6fed25a
Auto-generated-cl: translation import
 2015-01-21 07:30:19 -08:00
Geoff Mendal
703e20fea7 Merge "Import translations. DO NOT MERGE" 2015-01-21 15:21:26 +00:00