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

152707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Rowe
447369f2d2 am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 
* commit 'a1e3063ebe04c8c304f48a02117085962f75cb63':
  docs: update reference to FragmentRetainInstance
 2014-10-16 18:23:42 +00:00
Joe Fernandez
7e19b402c6 am 2f9ea27c: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs 
* commit '2f9ea27c6c95fa53eef0228edc0b3f63dbeb21e7':
  Typo fixed in sample code
 2014-10-16 18:23:18 +00:00
David Friedman
d12e6de645 Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev 2014-10-16 18:06:01 +00:00
Quddus Chong
49cc89ec51 docs: Updates to Android 5.0 API Overview. 
Change-Id: I0dcbb134fc499da0172bfe8d79c5aaa1a4b3ef75
 2014-10-16 11:01:42 -07:00
Svet Ganov
d5b0842a1d Send accessibility events with no window. 
An app can send an accessibility event by calling the send methods
on view or directly asking the accessibility manager to do that.
While the recommened way to send such events is calling the methods
on view a legacy app or app whose developer did not read the docs
carefully may be calling the accessibility manager APIs directly.
In such a case the event does not have assigned window id and does
not get send. Since events fired by using the accessibility manager
directly lack context to determine whether thier source is important
for accessibility we assume they come from an important view to
avoid breaking backwards compatibility.

bug:18001711

Change-Id: Ie1c298fa5a0670cbeaedfcd64f820961c296b6ca
 2014-10-16 17:31:52 +00:00
Andrew Solovay
6f6d10e744 docs: Updating support library pages for v.21. 
For doc stage location, see my comment of Oct 13 3:47 PM.

Change-Id: I4da98448cd95451c82b4e8198dcd95edf64398b8
 2014-10-16 10:31:31 -07:00
Rich Slogar
70807ab128 Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev 2014-10-16 17:10:49 +00:00
Andrew Solovay
34ef4ff9b7 Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev 2014-10-16 17:03:02 +00:00
Rich Slogar
54444f66a4 docs:Build and Platform Tools Updates for Android 5 
Change-Id: Ib7adf35c302d24a1c2394a89b3a04ca8d77cd296
 2014-10-16 10:02:22 -07:00
Scott Rowe
a1e3063ebe am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 
* commit 'ab64919c0e683dcd0f32f95f580f0d95ce29476d':
  docs: update reference to FragmentRetainInstance
 2014-10-16 17:01:04 +00:00
Scott Rowe
ab64919c0e Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 2014-10-16 16:56:55 +00:00
Scott Rowe
8f93624eaf docs: delete preview pages 
Change-Id: I76b6b8545bfed3ad0604043105ccf4795ab8be62
 2014-10-16 09:39:04 -07:00
Prerepa Viswanadham
248edc3e96 Update javadoc comments for getBluetoothLeAdvertiser() 
To clarify that BluetoothLeAdvertiser object will return null
when BT is off OR if the hw doesn't support these capabilities

bug: 18006072
Change-Id: I635d7971711a3cae7c58f7a0636faf9a03f19970
 2014-10-16 16:06:44 +00:00
Joe Fernandez
2f9ea27c6c am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs 
* commit '58c64870a8f3505d032ec7c5ac0fc4faba08347a':
  Typo fixed in sample code
 2014-10-16 14:39:16 +00:00
Joe Fernandez
58c64870a8 Merge "Typo fixed in sample code" into klp-modular-docs 2014-10-16 14:34:47 +00:00
Lorenzo Colitti
b7d8514822 Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev 2014-10-16 08:46:10 +00:00
Lorenzo Colitti
917c547beb Merge "Don't make lockdown VPN source firewall rules over-broad." into lmp-dev 2014-10-16 08:45:03 +00:00
Lorenzo Colitti
28dcf0345b Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev 2014-10-16 08:37:28 +00:00
Christopher Tate
185fcadf89 Merge "Fix spurious restore session timeouts" into lmp-dev 2014-10-16 03:29:00 +00:00
David Friedman
778d3552d6 OpenGL 3.1 and AEP documentation for L-release. 
Change-Id: I21b75a6f38977729fa8c1c94c66354054bdb780c
 2014-10-15 19:59:43 -07:00
Geoff Mendal
c71a7b3cb8 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-16 01:35:18 +00:00
Geoff Mendal
874633e378 Import translations. DO NOT MERGE 
Change-Id: Ifa43307e6081aa5fae63beb7756b583edf936c72
Auto-generated-cl: translation import
 2014-10-15 18:34:07 -07:00
Christopher Tate
0f32717a17 Fix spurious restore session timeouts 
The restore-session idle timeout should not be ticking while we're
doing legitimate restore work.  We now explicitly stop the timeout
ticker [a delayed message on our handler thread] whenever we undertake
a valid restore operation.  The timer is already correctly resumed
when restore operations conclude.

(In practice we need to suspend the timeout tracking at exactly those
times when we're entering the wakelock-protected restore flow.  The
timeout is reestablished when the wakelock is released; this part
is already in the code.)

Bug 17990544

Change-Id: I7318020ce30fd9c35bc3a644f8c101fd3d063c8b
 2014-10-16 01:34:01 +00:00
Brian Carlstrom
20de619d66 Merge "Set threads' contextClassLoader during LoadedApk.makeApplication." into lmp-dev 2014-10-16 01:01:26 +00:00
Marco Nelissen
36c931b31a Merge "Also consider secondary storage when verifying paths" into lmp-dev 2014-10-16 00:38:03 +00:00
Dirk Dougherty
a0b3796d93 Merge "Doc change: Add diffs for API level 21." into lmp-dev 2014-10-16 00:20:02 +00:00
Quddus Chong
0a276b9448 Merge "docs: Added L API overview." into lmp-dev 2014-10-15 23:26:43 +00:00
Dirk Dougherty
8ca0f84ea3 Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev 2014-10-15 22:40:19 +00:00
Marco Nelissen
c1fda12823 Also consider secondary storage when verifying paths 
Bug: 17673184
Bug: 17982103
Change-Id: Ief14c7776b02983191c46774fa7e4c76380de58d
 2014-10-15 15:36:50 -07:00
Dirk Dougherty
6034230b29 Doc change: Add diffs for API level 21. 
Change-Id: I6efad4bb407dbfc7684a5651788e116d624e778e
 2014-10-15 15:06:50 -07:00
Dirk Dougherty
963dca1a5d Doc change: Add diffs for l-preview -> API level 21. 
Change-Id: Ie60fbe9ed5891dd87fd9ca53f126c4617e09d3bd
 2014-10-15 14:59:15 -07:00
Geoff Mendal
e2a1f1cd88 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-15 21:52:24 +00:00
Craig Mautner
5d460b8871 Merge "Remove unnecessary logging." into lmp-dev 2014-10-15 21:48:52 +00:00
Geoff Mendal
89b5580b81 Import translations. DO NOT MERGE 
Change-Id: I5fc63b0e1cf68a8b5f17b46308abebaba76ce81c
Auto-generated-cl: translation import
 2014-10-15 14:37:19 -07:00
Eric Rowe
1b4a728ac6 Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev 2014-10-15 21:35:32 +00:00
Craig Mautner
3d7485c172 Remove unnecessary logging. 
Change-Id: Ia5b5325707f2f02f2c585130938565065e974938
 2014-10-15 14:30:02 -07:00
Craig Mautner
e52791055c Merge "Move desired task to top if not already there." into lmp-dev 2014-10-15 21:13:58 +00:00
Craig Mautner
737fae2b2e Move desired task to top if not already there. 
Under certain circumstances when launching a new activity, the
topmost stack activity is moved to the front even though the
activity is being created in a different task.

This checks if the topmost stack task matches the desired
task and if not, moves the desired task to the top.

Also make activity dump ordering consistent.

Fixes bug 17721767.

Change-Id: I59397f31b629a208f3863887c57d6f6fb1f6e1f3
 2014-10-15 14:11:23 -07:00
Eric Rowe
500f7583ed Add CHANGE_NETWORK_STATE permission to bt tests 
Change-Id: Ie0a579de3b7d1163a8fe245eb377f21eeed048a3
 2014-10-15 14:06:30 -07:00
John Spurlock
b2344c81bc Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev 2014-10-15 21:04:33 +00:00
Evan Charlton
843e234318 Add WindowManager.aidl to AIDL list 
WindowManager.aidl has an inner class (WindowManager.LayoutParams)
which needs to be included, but slipped past the api/current.txt grep.

This affects the SDK only

Change-Id: I71bea4e602428ab588d17c5e57cbe08a1d6e9493
 2014-10-15 13:26:32 -07:00
Quddus Chong
ccd80045a3 docs: Added L API overview. 
Change-Id: Idd042b41a99f61faa6b011c2900210ed38b017b9
 2014-10-15 13:25:55 -07:00
Jim Miller
3836c9a4c1 Fix getStorageEncryptionStatus() in DevicePolicyManager 
This fixes a bug introduced by a change where the function
ignores systems with default encryption where it's disabled.

The fix also checks to see if vold thinks the device is secure.

Fixes bug 17881324

Change-Id: I2c40f76cf990d90d1a825955aa3b080b21684426
 2014-10-15 13:15:52 -07:00
RoboErik
c7be69f1d6 Merge "Don't call size on a null metadata" into lmp-dev 2014-10-15 19:48:50 +00:00
Tom Taylor
6d4f457546 Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-dev 2014-10-15 19:20:36 +00:00
RoboErik
421c9df7ff Don't call size on a null metadata 
bug:18002951
Change-Id: I3a2d2c781e7b235efbd8518d60eee7f44bbacd75
 2014-10-15 12:17:43 -07:00
Prashant Malani
c64522fb2e am 645e017c: (-s ours) Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev 
* commit '645e017ca54e654c34b131235e90589a7d92ce0c':
  DO NOT MERGE Add empty ArrayList check.
 2014-10-15 19:12:33 +00:00
Ricardo Cervera
7e50d9706c am dc1f3080: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 
* commit 'dc1f308048a732572fae3cf92ddfe5cd943c0059':
  docs: Fixing notify link. Bug: 17571861
 2014-10-15 19:12:26 +00:00
Luan Nguyen
bff5c1932c am c07a288a: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs 
* commit 'c07a288a889ac88282118d4089e969f20c1aabe3':
  docs: Android Wear Design fixes
 2014-10-15 19:12:18 +00:00
smain@google.com
b3994c2e58 am e43bb6a9: am 075531ae: add the butterbar for L announce to Preview landing page 
* commit 'e43bb6a9ec8cd0841926e7df8cc738d5357814c1':
  add the butterbar for L announce to Preview landing page
 2014-10-15 19:12:05 +00:00