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

159255 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
276a324cd6 docs: Adding vector drawables video 
Change-Id: I6ea0e4fd3afb7c6d2e9ba314a92fe8e0128af42e
 2014-12-18 09:49:56 -08:00
Joe Fernandez
e78489b47c am e22b42b3: Merge "docs: plugin reference update" into lmp-docs 
* commit 'e22b42b3ae86763db4e8f1f02d2aa64555d7b593':
  docs: plugin reference update
 2014-12-18 17:48:05 +00:00
Joe Fernandez
e22b42b3ae Merge "docs: plugin reference update" into lmp-docs 2014-12-18 17:43:33 +00:00
Michael Runge
37fed329ad Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev 2014-12-18 01:49:08 +00:00
Rich Slogar
6dfc3aab02 am 879cffde: am 8838a9f0: docs: sdk revision 24.0.2 
automerge: 85e645a

* commit '85e645ac2bf38186dce177e29f7062a3645c7917':
  docs: sdk revision 24.0.2
 2014-12-18 01:33:53 +00:00
Eric Gilmore
2195f58301 am 41ea13c8: am fe7b93f4: Adding links for the last few files requested by PMs. 
automerge: 8d2af0f

* commit '8d2af0f9daf672183262a226e9c9410c54c133a2':
  Adding links for the last few files requested by PMs.
 2014-12-18 01:32:41 +00:00
Pavel Zhamaitsiak
3a35934540 Merge "IMS: Set phone account in IMS Conference object" into lmp-mr1-dev 2014-12-18 01:27:38 +00:00
Rich Slogar
85e645ac2b am 879cffde: am 8838a9f0: docs: sdk revision 24.0.2 
* commit '879cffdec9c6206a3d1f3babfef2b2940a72bfa2':
  docs: sdk revision 24.0.2
 2014-12-18 00:58:03 +00:00
Rich Slogar
879cffdec9 am 8838a9f0: docs: sdk revision 24.0.2 
* commit '8838a9f083ff2ecc748d70931e21cbd429ad0d45':
  docs: sdk revision 24.0.2
 2014-12-18 00:51:56 +00:00
Sanket Padawe
776164da3c Merge "Removing unwanted tethering profiles from config.xml" into lmp-mr1-dev 2014-12-18 00:44:08 +00:00
Rich Slogar
8838a9f083 docs: sdk revision 24.0.2 
Change-Id: I2427885aded49e7ceab5d66c8cb8d12cea19bc2c
 2014-12-17 16:40:53 -08:00
vandwalle
72e1d3f538 add debug logs to confirm network flapping issue is fixed 
Bug:18706288

Change-Id: I59378faafbccfa58639d942c8b8e2e0e815261f4
 2014-12-17 16:38:58 -08:00
Winson Chung
e2ed349cfa Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" into lmp-mr1-dev 2014-12-18 00:15:42 +00:00
Eric Gilmore
8d2af0f9da am 41ea13c8: am fe7b93f4: Adding links for the last few files requested by PMs. 
* commit '41ea13c8d2e350bb6167b79653f2aa65fa5d84c5':
  Adding links for the last few files requested by PMs.
 2014-12-18 00:08:10 +00:00
Amit Mahajan
e69b5d68c2 Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev 2014-12-17 23:58:11 +00:00
Eric Gilmore
41ea13c8d2 am fe7b93f4: Adding links for the last few files requested by PMs. 
* commit 'fe7b93f4f7fec93650d3faec23f9cf76841d2b9e':
  Adding links for the last few files requested by PMs.
 2014-12-17 23:56:21 +00:00
Eric Gilmore
fe7b93f4f7 Adding links for the last few files requested by PMs. 
Change-Id: If93e894a690ee5bef4b59caa234a97e3f0f7f6e4
 2014-12-17 15:46:37 -08:00
Craig Mautner
6b904ef474 Make window mgr stack movement track activity mgr 
There were situations where the activity manager ActivityStack was
moved to the front but the corresponding window manager TaskStack
was not. This caused the wrong activity to receive focus which led
to Application Not Responding errors.

One path in particular occurred in startActivityUncheckedLocked()
where curTop.task != intentActivity.task and
sourceStack.topActivity().task != sourceRecord.task. In this case
targetStack.moveTaskToFrontLocked() was never called.

This fix forces all calls to ActivityStack.moveToFront() to make
a call to WindowManagerService.moveTaskToTop() and eliminates
redundant calls to moveTaskToTop().

Fixes bug 17721767.

Change-Id: Ibf01389810dd36724eaec5a4a07560144b2f4cef
 2014-12-17 15:45:03 -08:00
Amit Mahajan
2a65688d40 Change to write (create) setting+subid if it does not already exist 
when it is queried for the first time.

Bug: 18791109
Change-Id: Ib9dae9401a18f1ec0eb0477486c7c7e4cb0364b0
 2014-12-17 15:42:56 -08:00
Raph Levien
078ce5fc82 Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev 2014-12-17 23:08:51 +00:00
Raph Levien
0b6e78d997 Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev 2014-12-17 23:04:17 +00:00
Raph Levien
047e816fe2 Revert "Change Linkify leniency to VALID" 
This reverts commit 9dfe86d4102b93885b947917fccee35053cfc9f2.

That change moved the lenience from POSSIBLE to VALID, which eliminated
false positive links, especially 4 digit phone numbers, but caused
significant false negatives, leading to CTS test failures
(android.text.util.cts.LinkifyTest#testAddLinks7 in particular).

The true fix requires new functionality to validate phone numbers in
a mobile context. In the meantime, the best solution is to revert.

Bug: 18708556
 2014-12-17 14:31:39 -08:00
Sanket Padawe
d6d84bb856 Removing unwanted tethering profiles from config.xml 
Bug: 18769044
Change-Id: I9002f6bdcd23bf02596798bcb5370ed456aaca39
 2014-12-17 14:19:58 -08:00
Michael Runge
01c06dfb07 Increase timeout when uncrypting OTA 
Larger OTAs (750 MB tested) are taking 3-4 minutes
to write, due to the O_SYNC needed to ensure that
the data is actually committed to disk prior to
reboot.

Bug: 18750317
Change-Id: Idfab3ffd0276df4548f69a09c72ad6f4a344b6e6
 2014-12-17 14:14:12 -08:00
Chris Craik
c748832f75 Merge "Revert overdraw avoidance visualization change" into lmp-mr1-dev 2014-12-17 22:07:04 +00:00
Jinsuk Kim
fadfe708e6 Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev 2014-12-17 21:15:20 +00:00
Anju Mathapati
f9c4d84ea9 IMS: Set phone account in IMS Conference object 
Get phone account from conference host connection and set
it to ImsConference while constructing

Bug: 18690773
Change-Id: I018a84512eb6ce001a8021d148895bf87dddc2ef
 2014-12-17 13:06:46 -08:00
Jeff Davidson
cc4f18309a Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev 2014-12-17 20:51:12 +00:00
Cheuksan Wang
e8ea164596 Merge "remove actions and calls for the old sms/mms api BUG: 18005911" into lmp-mr1-dev 2014-12-17 20:38:09 +00:00
John Spurlock
e7f301a053 Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev 2014-12-17 20:13:02 +00:00
smain@google.com
c6de288eab am 48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs automerge: b834c72 
automerge: 2a53e24

* commit '2a53e24e10654b7f5667899c8a110ef6742c79e3':
  make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145
 2014-12-17 19:57:42 +00:00
Chris Craik
ef8d6f272a Revert overdraw avoidance visualization change 
bug:18787324

Partial revert of 23d307c8d88f4a3849163b9e5b7cd11d0d4f372c.

Change-Id: Ic8b91b046707fc5b8fa53c35ea7b37bb19c3c943
 2014-12-17 11:21:02 -08:00
Winson Chung
7a96f3c917 Removing context ref from AppWidgetHost. (Bug 18769791) 
Change-Id: Ieec1314ece219c178c140e572b031c94e83b8a93
 2014-12-17 11:07:24 -08:00
Jorim Jaggi
c3059b444f Merge "Fix colored icons in doze mode" into lmp-mr1-dev 2014-12-17 18:59:40 +00:00
Jorim Jaggi
92df1f2758 Fix colored icons in doze mode 
Also fixes the issue that small icons promoted to large icons were
not forced to be white, which lead to inconsistent treatment of the
icons.

Bug: 18537470

Change-Id: Ic35e082da12793f3f13c91740bfc345b336c3db4
 2014-12-17 19:57:45 +01:00
Nicolas Prevot
f2bd50b2ec Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev 2014-12-17 18:54:55 +00:00
Paul Jensen
ee8feae5d4 Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev 2014-12-17 18:34:57 +00:00
smain@google.com
2a53e24e10 am 48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs 
automerge: b834c72

* commit 'b834c72e61943fda18153bb42b3c8bd80d604b0b':
  make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145
 2014-12-17 18:03:39 +00:00
smain@google.com
b834c72e61 am 48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs 
* commit '4842228377a292698b232f18706ce54cb7f7cc32':
  make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145
 2014-12-17 17:59:00 +00:00
Nicolas Prevot
fc7b444462 Fix the doc of addCrossProfileIntentFilter. 
Mention that cross-profile-intent-filters only work for activity intents.

BUG:18776618

Change-Id: I209d1e38641b4ae84b682a2525e6ddae603a71f9
 2014-12-17 17:55:08 +00:00
smain@google.com
4842228377 Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs 2014-12-17 17:52:08 +00:00
smain@google.com
58bd02739e make hidden text hidden with negative indent to avoid horizontal scroll 
bug: 18721145

Change-Id: I6efe51071d9d93697f1412243468353cd0c6d166
 2014-12-17 09:50:26 -08:00
Geoff Mendal
296aa92517 Import translations. DO NOT MERGE 
automerge: 43741a8  -s ours

* commit '43741a8c8371e3a473794cc2d2a81dda777e8724':
  Import translations. DO NOT MERGE
 2014-12-17 17:45:09 +00:00
Christoph Studer
e326af3cdb am 3eff1e1f: am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs 
automerge: 4328588

* commit '4328588cb532571c3b11867048d0972ff2e4d969':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-17 17:43:33 +00:00
Joe Fernandez
e8ce10dac8 am 6ff265cc: am df916a89: Merge "docs: studio revision 21 update" into lmp-docs 
automerge: ca27fb9

* commit 'ca27fb9711f24df8b88a41c8a360f57c7252ba79':
  docs: studio revision 21 update
 2014-12-17 17:42:19 +00:00
Joe Fernandez
c79d5e29de am f9ea93cd: am 80287e76: Merge "docs: studio tools help monkey update" into lmp-docs 
automerge: e479dc2

* commit 'e479dc219ff4d289105e32264c1fa66187aa5555':
  docs: studio tools help monkey update
 2014-12-17 17:40:58 +00:00
Joe Fernandez
85787187fc am b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs 
automerge: 9381301

* commit '93813012c0be63a4cbcdf9e076323fd4afd6dfb7':
  docs: help-adt link updates
 2014-12-17 17:39:45 +00:00
Sungsoo Lim
47aafcd66c am 31d592dc: am cd45de8b: Missing Javadoc update while API review 
automerge: d0b09b0

* commit 'd0b09b04b8c2bf666b15fcc1c496d6ab33c44a86':
  Missing Javadoc update while API review
 2014-12-17 17:37:53 +00:00
Christopher Tate
52ab8613ea am 5c3e277f: Fix bad alarm delivery 
automerge: be3206e

* commit 'be3206ecdce7aead184e8939a29ac7dd5f91931e':
  Fix bad alarm delivery
 2014-12-17 17:36:46 +00:00
John Spurlock
57627794b6 Audio policy: Fix deprecated shouldVibrate api. 
And apply zen mode immediately to avoid race conditions
in tests.

Bug: 18702149
Change-Id: Iad156a29b9e6a5998e7c2dafa8b79a71447066f9
 2014-12-17 12:34:00 -05:00