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

197937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
b30f841cb4 resolved conflicts for merge of c1244a29 to mnc-dr-dev 
Change-Id: I8b3e3a21e36ac5085bf1dffa90e49dabd17dd139
 2015-07-22 12:00:56 -07:00
Geoff Mendal
c41e319165 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-22 15:56:29 +00:00
Geoff Mendal
fb91daa1c5 Import translations. DO NOT MERGE 
Change-Id: If03e28dba328619399e4f81a01283afbebd7d50d
Auto-generated-cl: translation import
 2015-07-22 10:42:52 -05:00
Geoff Mendal
920e8be69d Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-22 13:58:09 +00:00
Geoff Mendal
e292d5b86e Import translations. DO NOT MERGE 
Change-Id: If222f66dff503d3b3f0349d76fd082a6780414d7
Auto-generated-cl: translation import
 2015-07-22 06:53:49 -07:00
Geoff Mendal
e573ee63b7 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-22 13:51:43 +00:00
Geoff Mendal
7f722ede33 Import translations. DO NOT MERGE 
Change-Id: I064668ffb91d718c0981ecd0f221e5f3b0d364d7
Auto-generated-cl: translation import
 2015-07-22 06:50:26 -07:00
Geoff Mendal
b568f3fdc9 Import translations. DO NOT MERGE 
Change-Id: I51a4605c050aab170712962b4cc2a7df7ca9174d
Auto-generated-cl: translation import
 2015-07-22 06:49:42 -07:00
Jorim Jaggi
c1244a2995 Merge "Touch, wake and unlock" into mnc-dev 2015-07-21 21:53:11 +00:00
Jeff Sharkey
b020b0d97d am cf051d18: Merge "Avoid NPE when no staged installs." into mnc-dev 
* commit 'cf051d1846c347413d8c907b42f3fce74795a815':
  Avoid NPE when no staged installs.
 2015-07-21 21:36:56 +00:00
Jeff Sharkey
cf051d1846 Merge "Avoid NPE when no staged installs." into mnc-dev 2015-07-21 21:23:59 +00:00
John Reck
9317d0b990 am 1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev 
* commit '1fddd3efa9ac10e794d7bdf457b7b52c7e4614f7':
  Mark isInUse per-window
 2015-07-21 21:04:45 +00:00
John Reck
1fddd3efa9 Merge "Mark isInUse per-window" into mnc-dev 2015-07-21 20:50:30 +00:00
Fyodor Kupolov
cf6500b9ba am 55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev 
* commit '55a116d00ca3f7b84a6af1c5c3472323ad5bc6ca':
  Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
 2015-07-21 20:50:24 +00:00
Fyodor Kupolov
55a116d00c Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev 2015-07-21 20:32:28 +00:00
Amith Yamasani
89d4131d75 am 09ba7151: Merge "Don\'t kill apps that are multi-user aware..." into mnc-dev 
* commit '09ba71513ba3bb092eb3effbe45953c50430ff20':
  Don't kill apps that are multi-user aware...
 2015-07-21 20:18:02 +00:00
Amith Yamasani
09ba71513b Merge "Don't kill apps that are multi-user aware..." into mnc-dev 2015-07-21 20:04:22 +00:00
Alex Klyubin
a69e72c547 am 5d586dd5: Merge "KM module may consume less input than provided by finish time." into mnc-dev 
* commit '5d586dd585a6663290b68abce433a75b5760fc5d':
  KM module may consume less input than provided by finish time.
 2015-07-21 20:02:21 +00:00
Alex Klyubin
5d586dd585 Merge "KM module may consume less input than provided by finish time." into mnc-dev 2015-07-21 19:50:50 +00:00
Adam Lesinski
a50f43e002 am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev 
* commit '23e19066de2caf1db1fa0759ac49a1118b59f7a5':
  BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
 2015-07-21 19:40:24 +00:00
Christopher Tate
6391a8d446 am d9c2ff99: Merge "Add \'pm\' operation to set a package\'s app-linking state" into mnc-dev 
* commit 'd9c2ff99bf9469f155eabf341880d055741e9db5':
  Add 'pm' operation to set a package's app-linking state
 2015-07-21 19:28:04 +00:00
Adam Lesinski
23e19066de Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev 2015-07-21 19:26:45 +00:00
Svetoslav
358af14345 am 81adda25: Merge "Always create nodes for views backed by an adapter." into mnc-dev 
* commit '81adda25b396ee3db794bc9a7946b579d01c2aa0':
  Always create nodes for views backed by an adapter.
 2015-07-21 19:12:13 +00:00
Christopher Tate
d9c2ff99bf Merge "Add 'pm' operation to set a package's app-linking state" into mnc-dev 2015-07-21 19:11:37 +00:00
Adam Lesinski
6856964444 BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources 
Previously we tried to read /d/wakeup_sources to gather kernel wakelock data. If that
fails we used the older sys file /proc/wakelocks.
N7 has both /proc/wakelocks and /d/wakeup_sources, but /proc/wakelocks
has the actual data we need. All other devices are using /d/wakeup_sources, so
only N7 experienced a loss of kernel wakelock data.

The original regression was introduced here: ag/659258

Bug:22556242
Change-Id: I51ec68e957f587bc1466e24f0a1dbc8cd7753ac6
 2015-07-21 12:08:56 -07:00
Fyodor Kupolov
53019287fd Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction 
Bug: 21521860
Change-Id: I0c2659f84589a77432317fbc89d49716027577d3
 2015-07-21 12:06:14 -07:00
Svetoslav
81adda25b3 Merge "Always create nodes for views backed by an adapter." into mnc-dev 2015-07-21 19:01:19 +00:00
Amith Yamasani
c1cbaaba6c Don't kill apps that are multi-user aware... 
... when looking for background user apps that hold RECORD_AUDIO
permission.

On switching users, we kill any apps that might potentially be
recording audio. But we don't want to kill critical apps that need
to stay running because of multi-user aware services.

Bug: 22564430
Change-Id: I6d9a684d4e044cc3018f0f8181a44aa143a3baeb
 2015-07-21 11:46:14 -07:00
Todd Kennedy
548871f202 am f2805bcb: Merge "Use RingtonePlayer to get ringtone title" into mnc-dev 
* commit 'f2805bcbe1c99ce806448a2d8c0f12b142c7cece':
  Use RingtonePlayer to get ringtone title
 2015-07-21 18:21:33 +00:00
Todd Kennedy
f2805bcbe1 Merge "Use RingtonePlayer to get ringtone title" into mnc-dev 2015-07-21 18:11:19 +00:00
John Reck
00e79c9947 Mark isInUse per-window 
Bug: 22509159
Change-Id: I0ae0f1fa582ee38dcb9f24ca20f0b4d0c57ccb32
 2015-07-21 10:46:54 -07:00
Nick Kralevich
894ffd102d am 673ccfd4: Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev 
* commit '673ccfd45a81482d97eecf76dc0fef0dfd57be73':
  UsbDeviceManager: add back support for USB overlays
 2015-07-21 17:25:30 +00:00
Nick Kralevich
673ccfd45a Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev 2015-07-21 17:16:10 +00:00
Raph Levien
7026617e74 am 1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev 
* commit '1fcb6d3ae27ac95388eb036d124bd4bd0c6559cc':
  Respect style boundaries when measuring text
 2015-07-21 17:04:36 +00:00
Raph Levien
1fcb6d3ae2 Merge "Respect style boundaries when measuring text" into mnc-dev 2015-07-21 16:55:39 +00:00
Diego Perez
c273c178d7 am 66e66831: Merge "resolved conflicts for merge of 112d8a36 to mnc-dev" into mnc-dev 
* commit '66e6683193f6a1d071710ea8a39b02f5129fc505':
  Render to measured size when using expand mode
 2015-07-21 15:50:11 +00:00
Diego Perez
66e6683193 Merge "resolved conflicts for merge of 112d8a36 to mnc-dev" into mnc-dev 2015-07-21 15:41:12 +00:00
Wale Ogunwale
7dcad6a5d4 am e99f20f5: Merge "Don\'t duplicate recent tasks of the same affinity." into mnc-dev 
* commit 'e99f20f5873c00b35f2407e28e06ff9119f85088':
  Don't duplicate recent tasks of the same affinity.
 2015-07-21 14:38:04 +00:00
Diego Perez
b9935889b1 resolved conflicts for merge of 112d8a36 to mnc-dev 
Change-Id: Ic9511a57db8a96f54dba0704800789a8602b9dd2
 2015-07-21 15:32:55 +01:00
Wale Ogunwale
e99f20f587 Merge "Don't duplicate recent tasks of the same affinity." into mnc-dev 2015-07-21 14:28:16 +00:00
Wale Ogunwale
7cbfcd8865 Don't duplicate recent tasks of the same affinity. 
In change 510e554283d3dc250f836cd3e4abc36d87319333 we stated
limiting the number of document activity entries in recents
by comparing the realActivity of the tasks. This compared was
done for all tasks not just document tasks there by breaking
the use of task affinity to remove tasks with the same affinity
from recent task list. This change limits the compare of
realActivity to just document tasks.

Bug: 22564474
Bug: 18642190
Change-Id: Idc21ec311f194ab2005cb22380ca56303ae0ad94
 2015-07-21 07:26:36 -07:00
Diego Perez
112d8a3641 am d6f2a9ef: am 7720eb18: Merge "Render to measured size when using expand mode" into lmp-mr1-dev 
* commit 'd6f2a9efbb0e0525f6cf970fd9c9b9b7082b19f9':
  Render to measured size when using expand mode
 2015-07-21 13:20:23 +00:00
Diego Perez
d6f2a9efbb am 7720eb18: Merge "Render to measured size when using expand mode" into lmp-mr1-dev 
* commit '7720eb18c1c2fe06e8f4b2f6e2936a4072494da8':
  Render to measured size when using expand mode
 2015-07-21 13:06:52 +00:00
Diego Perez
7720eb18c1 Merge "Render to measured size when using expand mode" into lmp-mr1-dev 2015-07-21 12:56:56 +00:00
Christopher Tate
387225ff01 Add 'pm' operation to set a package's app-linking state 
Set an app's state:

  pm set-app-link [--user USER_ID] PACKAGE {always|ask|never|undefined}

Read an app's current state:

  pm get-app-link [--user USER_ID] PACKAGE

The latter prints to stdout one of the strings usable as an argument to
set-app-link.  If an error is encountered, the string printed to
stderr begins with "Error: ".

Bug 19628527

Change-Id: I68b6dc24445917807345a8cf5baa2078490740af
 2015-07-20 17:45:17 -07:00
Todd Kennedy
68de157b78 Use RingtonePlayer to get ringtone title 
Instead of requiring every application that calls Rintone.getTitle()
to request android.permission.READ_EXTERNAL_STORAGE, pass the call
through to the system UI process. We only do this for media store
URIs.

Bug: 22067670
Change-Id: I38cf3fb8d769ef6984c41a7b04afbbd4c57175ce
 2015-07-20 17:24:15 -07:00
Jae Seo
6564934d1a am b2eed1d6: Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev 
* commit 'b2eed1d6e11f38c00ce1776ade14dfa004c6119f':
  TIF: Get or create the user state when failed to find existing one
 2015-07-21 00:10:47 +00:00
Terry Heo
aaf67d9527 am e95af4ab: Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev 
* commit 'e95af4ab8bda68ee80bf4d444356e0c1afb1fe99':
  TIF: Use copied track list for onTracksChanged() callback
 2015-07-21 00:10:43 +00:00
Jae Seo
b2eed1d6e1 Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev 2015-07-20 23:59:25 +00:00
Terry Heo
e95af4ab8b Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev 2015-07-20 23:57:31 +00:00