Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
157,793 Commits 3 Branches 0 Tags
27fbf67644bed5d0d590458ad89cee38d8fddeaa
Commit Graph

157793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
27fbf67644 Merge "Update documentation for DatePicker to reflect the new mode" into lmp-mr1-dev 2014-11-25 00:50:50 +00:00
Tom Taylor
4cd3e47e58 Merge "Issues with messaging apps on non-primary user account" into lmp-mr1-dev 2014-11-24 23:14:42 +00:00
Ruben Brunk
8791a1e81a Merge "Camera2: Ignore unsupported face detection results in LEGACY." into lmp-mr1-dev 2014-11-24 23:11:33 +00:00
Jeff Sharkey
07aca15b96 Merge "Better am error when SELinux blocking access." into lmp-mr1-dev 2014-11-24 23:05:08 +00:00
RoboErik
d9bb296b56 Merge "Delay calling onConnected until a session is set in MediaBrowser" into lmp-mr1-dev 2014-11-24 23:04:59 +00:00
Jeff Sharkey
dbea3cd118 Better am error when SELinux blocking access. 
Bug: 18479882
Change-Id: I0732e54838c4e04d9d727e7c5fd9d7e7bacbaa1f
 2014-11-24 14:51:34 -08:00
Jeff Sharkey
0f667f5855 Merge "Ignore spammy package logs when dumping." into lmp-mr1-dev 2014-11-24 22:21:27 +00:00
Jeff Sharkey
7038c39012 Merge "Move Documents action bar update even later." into lmp-mr1-dev 2014-11-24 22:18:51 +00:00
Alan Viverette
d25eb9fbb9 Update documentation for DatePicker to reflect the new mode 
BUG: 18508605
Change-Id: I23d45bf1cd7783fa6f397c15f0ba6802e4069d6b
 2014-11-24 14:07:24 -08:00
Alan Viverette
760cfb02de Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-dev 2014-11-24 21:57:51 +00:00
Jeff Sharkey
962bd4a691 Ignore spammy package logs when dumping. 
Bug: 18390552
Change-Id: Ie333f57d46d6ab3f4b9daa17f98b1e94a236e959
 2014-11-24 13:43:45 -08:00
Jean-Michel Trivi
8c81609616 Merge "Add support for audio focus locking" into lmp-mr1-dev 2014-11-24 21:39:30 +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
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
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
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
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
Alan Viverette
7e0aaae3db Check for null drawable in theme-less getDrawable() 
BUG: 18507509
Change-Id: I64e2950dc3a30f3979ec179789a6f6e055c9f86d
 2014-11-24 11:27:09 -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
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
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
John Spurlock
4dfce43e97 Merge "QS: Update data usage over limit title." into lmp-mr1-dev 2014-11-24 18:34:58 +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
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
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
Dianne Hackborn
2bbea56d12 Merge "Final resource IDs." into lmp-mr1-dev 2014-11-24 17:54:06 +00:00
Dianne Hackborn
5bbb1af74a Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev 2014-11-24 17:53:50 +00:00
Tom Taylor
86201db27e Issues with messaging apps on non-primary user account 
Bug 18399514

Adjust the contentUri to contain the caller's userId so that when
the phone process tries to open the Uri, it will open the provider
on the correct user.
Also make sure the Uri grants are properly qualified. We only need to grant
permission for sending. Receiving an MMS is always done by the primary
user and doesn't need special permissions. Move various permission grants
from the SmsManager to here.

Change-Id: Ib192f651ab05db9f07e9e6245bb343ed7a55b18e
 2014-11-24 09:36:43 -08:00
Jeff Brown
b5686d5596 am 3d110b23: Make WallpaperService watch the actual display state. 
* commit '3d110b239153a6c7423a99f02ef859201205eee2':
  Make WallpaperService watch the actual display state.
 2014-11-24 17:34:32 +00:00
John Spurlock
beaf117889 QS: Update data usage over limit title. 
Bug: 18499916
Change-Id: I468eb40cbbbef52853c52e196e458d72f103765a
 2014-11-24 12:25:32 -05:00
smain@google.com
43eabc8f13 add intro videos (w/ shadowbox) to Auto and Wear landing pages. 
Change-Id: Ieb730416b7a469c7cbd0e80d1e9f74f14a7adb70
 2014-11-24 09:25:00 -08:00
Sreeram Ramachandran
6d0e8711d0 Merge "Delete unused/non-working code." into lmp-mr1-dev 2014-11-24 17:24:26 +00:00
Sreeram Ramachandran
45e2732717 Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev 2014-11-24 17:24:04 +00:00
Sreeram Ramachandran
aaea7e8114 Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev 2014-11-24 17:21:18 +00:00
Geoff Mendal
234e25fbda Import translations. DO NOT MERGE 
Change-Id: Ia6e19184b9f8f2ef31f1ea94263fe1090333837e
Auto-generated-cl: translation import
 2014-11-24 08:51:30 -08:00
Jorim Jaggi
f510a8a688 Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev 2014-11-24 16:26:03 +00:00
Adrian Roos
8a9242428b Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev 2014-11-24 16:03:56 +00:00