Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
164,750 Commits 3 Branches 0 Tags
d98e7c1df774eb86a67310f5cbc0dbdd91f33c19
Commit Graph

164750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Davidson
6fdf2a1709 am 6ea4e11d: Merge "Don\'t enforce control permission when preparing consented VPN." into lmp-mr1-dev 
* commit '6ea4e11d9817d85eb5c0ff445154985e4eb0c534':
  Don't enforce control permission when preparing consented VPN.
 2014-11-24 21:25:41 +00:00
Jinsuk Kim
c27f5baaeb am 51cb7aa7: Merge "CEC: Do not issue non-effective <Routing Change>" into lmp-mr1-dev 
* commit '51cb7aa774cf6ab7727928d136052c61325a8031':
  CEC: Do not issue non-effective <Routing Change>
 2014-11-24 21:21:12 +00:00
Jeff Davidson
6ea4e11d98 Merge "Don't enforce control permission when preparing consented VPN." into lmp-mr1-dev 2014-11-24 21:19:56 +00:00
Geoff Mendal
6a0ec6e606 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-24 21:15:29 +00:00
Jinsuk Kim
51cb7aa774 Merge "CEC: Do not issue non-effective <Routing Change>" into lmp-mr1-dev 2014-11-24 21:14:02 +00:00
Geoff Mendal
db3b7b5846 am 597226d6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '597226d6f2adb3fd70d669e168a2d6171222ad1a':
  Import translations. DO NOT MERGE
 2014-11-24 20:49:28 +00:00
Geoff Mendal
597226d6f2 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-24 20:44:58 +00:00
RoboErik
d64c425f32 Delay calling onConnected until a session is set in MediaBrowser 
This will delay all calls to onConnected from the MediaBrowserService
until a session token has been set. This also requires making it an
exception to try setting the session twice.

bug:18052336
Change-Id: Iecf186c53364183e1696af83a855c8db3294a5d0
 2014-11-24 12:35:20 -08:00
Christoph Studer
265c10587a NoMan: Optimize grouped notifications 
When SysUI is the only notification listener, drop group children
if there is a group summary in NoMan.

There are two changes needed to achieve this:
1. Cancel children when a summary is posted
2. Drop children if there is a summary

Bug: 18460939
Change-Id: I5a3f30b0b23b2a784783749f58352c05a7fb9e59
 2014-11-24 21:33:34 +01:00
Jeff Sharkey
58b699c366 am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev 
* commit '636baa0d2451a531f8e83f5cdfc0d709989c4862':
  Introduce revision codes for split APKs.
 2014-11-24 20:20:10 +00:00
Jeff Sharkey
43aef1643b Move Documents action bar update even later. 
At some point Activity started restoring the Toolbar/ActionBar title
during onPostCreate(), which would clobber some of the setup we just
finished doing.  To fix, move our update to be even later in the
restore lifecycle.

Also fix grid item widths for small screen devices.

Bug: 17428127
Change-Id: I258121b6a6eec5924f92b02290a67d3ae7dd9cf6
 2014-11-24 12:17:12 -08:00
Jeff Sharkey
636baa0d24 Merge "Introduce revision codes for split APKs." into lmp-mr1-dev 2014-11-24 20:16:17 +00:00
Jeff Sharkey
88d2a3c0e1 Introduce revision codes for split APKs. 
Apps delivered as multiple split APKs must have identical package
names, version code, and signatures.  However, developers may want
to iterate quickly on a subset of splits without having to increment
the version code, which would require delivery of the entire app.

This change introduces "revision codes" which can vary between
split APKs belonging to the same app.  An install is valid as long
as the normal version code is identical across all splits.  Splits
can be added/removed to an app over time, but if a split is present
across an upgrade the revision code must not decrease.

Since system apps could have been updated with splits, only revert
to the built-in APKs if the version code is strictly greater than the
data version.  Also fix bug to enable inheriting from system apps
when adding splits.

Bug: 18481866
Change-Id: I34d8e14c141a8eb95c33ffe24b4e52d6af5c8260
 2014-11-24 12:13:11 -08:00
Sailesh Nepal
8c2a8f64b9 am 0afd49a1: Merge "Add system API to get registered connection managers" into lmp-mr1-dev 
* commit '0afd49a1721a5fd71ecf69e6bc62cdb3c8591341':
  Add system API to get registered connection managers
 2014-11-24 20:01:25 +00:00
Jorim Jaggi
82bb648b5a am 6b770744: Merge "Fix quick settings on Keyguard" into lmp-mr1-dev 
* commit '6b77074438f191de4fcfa1f1560fb5f038cb8173':
  Fix quick settings on Keyguard
 2014-11-24 20:01:19 +00:00
Chris Wren
fa5768cef4 am 1b26cc5b: Merge "LED should not be blocked by interruption filtering." into lmp-mr1-dev 
* commit '1b26cc5b7ab5733b94741f17c84eb4b140eaf045':
  LED should not be blocked by interruption filtering.
 2014-11-24 20:00:55 +00:00
smain@google.com
f00d46db37 am 79b496e8: am 75cd7c74: am 5f3ba993: am 1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs 
* commit '79b496e867f15529e442bbd19f6d0a75bf3f9f38':
  add intro videos (w/ shadowbox) to Auto and Wear landing pages.
 2014-11-24 20:00:50 +00:00
Sailesh Nepal
0afd49a172 Merge "Add system API to get registered connection managers" into lmp-mr1-dev 2014-11-24 19:36:58 +00:00
Jorim Jaggi
6b77074438 Merge "Fix quick settings on Keyguard" into lmp-mr1-dev 2014-11-24 19:31:30 +00:00
Jorim Jaggi
58bef33499 Fix quick settings on Keyguard 
- Fix that quick settings couldn't be scrolled nor closed on Keyguard
if scrolling was needed.
- Fix jumping in unlock motion when closing both panel and QS
- Fix invalid panel height when closing both QS and panel

Bug: 18481668
Change-Id: Ifd12e29bbc64f72f0dc13b43e36b1a57df7524fa
 2014-11-24 20:30:42 +01:00
Geoff Mendal
24bc59be4c Import translations. DO NOT MERGE 
Change-Id: Ia5a03d8dd7c8d82c4f65421b1b2985bdffceee19
Auto-generated-cl: translation import
 2014-11-24 11:28:36 -08:00
Alan Viverette
7e0aaae3db Check for null drawable in theme-less getDrawable() 
BUG: 18507509
Change-Id: I64e2950dc3a30f3979ec179789a6f6e055c9f86d
 2014-11-24 11:27:09 -08:00
Bo Liu
de92f4c72b Fix crash in getNativeCanvas when canvasHandle is NULL 
BUG: 18261928
Change-Id: I01a5af201fe829d5752433e1bb0db7edc01733d4
 2014-11-24 11:25:45 -08:00
Geoff Mendal
de4b74a6ac Import translations. DO NOT MERGE 
Change-Id: I753b271eb5b97b719fe6d4aa50d21431a961d553
Auto-generated-cl: translation import
 2014-11-24 11:21:09 -08:00
Chris Wren
1b26cc5b7a Merge "LED should not be blocked by interruption filtering." into lmp-mr1-dev 2014-11-24 19:15:49 +00:00
Alan Viverette
d7dab349c2 Ensure calling mutate() on DrawableContainer creates a new state 
Previously, a new state would only be created on newDrawable(), which
caused the first drawable loaded for a resource to share constant state
with the cached version. Even if mutate() was called, the constant
state was still shared and any changes were applied to the cached copy.

BUG: 18504919
Change-Id: I1ce76fbbc144e9c0c93261e3a12cc613d0c74b83
 2014-11-24 11:11:05 -08:00
smain@google.com
79b496e867 am 75cd7c74: am 5f3ba993: am 1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs 
* commit '75cd7c74ab38a55914f1658234a0031c907eb3ed':
  add intro videos (w/ shadowbox) to Auto and Wear landing pages.
 2014-11-24 19:11:04 +00:00
smain@google.com
75cd7c74ab am 5f3ba993: am 1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs 
* commit '5f3ba99376a7d01a4d142f2e34576202870b0a46':
  add intro videos (w/ shadowbox) to Auto and Wear landing pages.
 2014-11-24 19:02:34 +00:00
smain@google.com
5f3ba99376 am 1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs 
* commit '1b23ee962a1ce0963537810724b2be61c0ab8c57':
  add intro videos (w/ shadowbox) to Auto and Wear landing pages.
 2014-11-24 18:55:57 +00:00
smain@google.com
1b23ee962a Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs 2014-11-24 18:51:03 +00:00
John Spurlock
98a20f68e0 am 4dfce43e: Merge "QS: Update data usage over limit title." into lmp-mr1-dev 
* commit '4dfce43e976a294b3b575564c855214a8e5cef58':
  QS: Update data usage over limit title.
 2014-11-24 18:48:59 +00:00
Jean-Michel Trivi
958876fe55 Add support for audio focus locking 
New API for a registered AudioPolicy to lock/unlock the audio
  focus stack and prevent any new grant of focus, similar to
  the way phone calls behave.

Bug 16010554

Change-Id: If34a58ca9bd43d5479e94a2a7b540750b4c6efe9
 2014-11-24 10:46:12 -08:00
Paul Lawrence
c38182ff3b Add mechanism for securely returning parameters though NativeDaemonConnector 
If the first word in the response is {{sensitive}}, don't log the body of the
response.

Bug: 18260068
Change-Id: Ibfb5c6abab1d04b4321cdbcf6c7cf6f18f903146
 2014-11-24 10:41:37 -08:00
Paul Lawrence
d66f3e584b Revert "DO NOT MERGE: Don't log passwords returned from vdc" 
This reverts commit 70c9a06af0.

The original change disabled all logging of RCVed messages in NativeDaemonConnector.
For MR1 we want a much more surgical disabling of sensitive messages. First,
though, we have to defeat the automerger.

Change-Id: I712919aee2db63f7fc0b2c6d6a2a658325dce596
 2014-11-24 10:40:15 -08:00
Natalie Masse
e24908e342 Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation 
Change-Id: Ie433d4bfd7ac7fd2e524a201497c250a7aede47d
 2014-11-24 18:38:00 +00:00
Paul Jensen
080b02fc6c am e57064a2: Merge "Don\'t bother validating networks that don\'t satisfy the default request." into lmp-mr1-dev 
* commit 'e57064a289082758fcb9bb71f987dde84931e3e6':
  Don't bother validating networks that don't satisfy the default request.
 2014-11-24 18:36:27 +00:00
John Spurlock
4dfce43e97 Merge "QS: Update data usage over limit title." into lmp-mr1-dev 2014-11-24 18:34:58 +00:00
Geoff Mendal
5d50bf02a6 am 44b769d0: (-s ours) am 3a013dab: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '44b769d0103df57ccf16f84e037af7d44950aa0a':
  Import translations. DO NOT MERGE
 2014-11-24 18:32:14 +00:00
Paul Jensen
e57064a289 Merge "Don't bother validating networks that don't satisfy the default request." into lmp-mr1-dev 2014-11-24 18:30:36 +00:00
Svet Ganov
f34896bbeb am c9f499d2: Merge "Print spooler crash when printing after a rotation." into lmp-mr1-dev 
* commit 'c9f499d2f1cd598b90bfb8c13e505354555caea8':
  Print spooler crash when printing after a rotation.
 2014-11-24 18:27:52 +00:00
Amit Mahajan
ed7ccb45c0 am 77348365: Merge "Set network selection to automatic when in Global mode" into lmp-mr1-dev 
* commit '77348365088577fd760c9d18f488c30dcc2fe1c2':
  Set network selection to automatic when in Global mode
 2014-11-24 18:27:46 +00:00
John Reck
c68728f5e9 am b059ff81: am 2b36a86b: Wire up surface width/height to lockHardwareCanvas DO NOT MERGE 
* commit 'b059ff81570247f8c00098c68ffafcbf98941d54':
  Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
 2014-11-24 18:27:41 +00:00
Geoff Mendal
44b769d010 am 3a013dab: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '3a013dab155acafab6a80e6b13a82252b69abd9f':
  Import translations. DO NOT MERGE
 2014-11-24 18:24:23 +00:00
Svet Ganov
c9f499d2f1 Merge "Print spooler crash when printing after a rotation." into lmp-mr1-dev 2014-11-24 18:23:37 +00:00
Amit Mahajan
7734836508 Merge "Set network selection to automatic when in Global mode" into lmp-mr1-dev 2014-11-24 18:22:02 +00:00
John Reck
b059ff8157 am 2b36a86b: Wire up surface width/height to lockHardwareCanvas DO NOT MERGE 
* commit '2b36a86b8ee4e8c0952494dd17b5e96ded22f2ee':
  Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
 2014-11-24 18:19:45 +00:00
Geoff Mendal
3a013dab15 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-24 18:18:15 +00:00
Dianne Hackborn
d65cb22872 am 2bbea56d: Merge "Final resource IDs." into lmp-mr1-dev 
* commit '2bbea56d1258f7b55183ddba6364815f17aafe88':
  Final resource IDs.
 2014-11-24 17:59:48 +00:00
Dianne Hackborn
608439df38 am 5bbb1af7: Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev 
* commit '5bbb1af74a40f60d6609c2b1c580cb91ffb12c54':
  Work on issue #18486438: Reduce size of bugreport output
 2014-11-24 17:59:43 +00:00
John Reck
2b36a86b8e Wire up surface width/height to lockHardwareCanvas DO NOT MERGE 
Bug: 18338026
Change-Id: I6c37774ef1312278ae81280561060662fef923fb
(cherry picked from commit b35c9602cf)
 2014-11-24 17:59:38 +00:00