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

194790 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
00a34ab54c Merge "Protect against null detail record." into mnc-dev 2015-06-11 20:06:11 +00:00
Carlos Valdivia
d0041e5f47 Merge "Revert "Permissions: Fix account related permissions."" into mnc-dev 2015-06-11 20:04:44 +00:00
Carlos Valdivia
dcddc47665 Revert "Permissions: Fix account related permissions." 
This reverts commit ffb46022b30dffdf1cc4cbd08d4bcbe51e1f8814.

Change-Id: I4c62b1b5a5bd4e2a5fac76244a16730526ed67fc
 2015-06-11 20:04:04 +00:00
Jason Monk
78dcee592b Protect against null detail record. 
Bug: 21779477
Change-Id: I70abe5d88f7ca0db782182937f5b73a9e9be1f5a
 2015-06-11 15:57:41 -04:00
Jeff Sharkey
c8488e99e8 Merge "Ignore some more generic USB device names." into mnc-dev 2015-06-11 19:57:25 +00:00
Jeff Sharkey
47b872d9c3 Ignore some more generic USB device names. 
Bug: 21376386
Change-Id: I8c1b1cf9d881ad2795e9b15740ff511260572f1b
 2015-06-11 12:54:42 -07:00
Chris Craik
e22c59b291 Trace each stage of Choreographer driven frames 
bug:21374535

Change-Id: I332dac216defbc4517441e2a9cdffdf71731f1e6
 2015-06-11 19:51:38 +00:00
Makoto Onuki
bf2ccf9455 Merge "Fix the PFD detachFd issue." into mnc-dev 2015-06-11 19:39:17 +00:00
Eino-Ville Talvala
cd17a84a86 Merge "Add more specific consumer names for common buffer queue endpoints." into mnc-dev 2015-06-11 19:36:17 +00:00
Makoto Onuki
b30ad6f5e8 Fix the PFD detachFd issue. 
Bug 18566244

Change-Id: I410b2219e08c9108236e2c2926bd613315198703
 2015-06-11 12:34:22 -07:00
Svet Ganov
db6ac98ec3 Merge "DO NOT MERGE Remove SUBSCRIBED_FEEDS permissions from framework b/20220885" into mnc-dev 2015-06-11 18:52:39 +00:00
Svet Ganov
9fb3c8826c DO NOT MERGE Remove SUBSCRIBED_FEEDS permissions from framework 
b/20220885

Instead, move it to GSF:
ag/700092

SUBSCRIBED_FEEDS_READ/WRITE permissions guard the Content Provider
that stores sync feeds for 1p apps (Gmail, Claendar, etc).
The sync feeds are used for delivering and processing
GCM tickle-to-sync messages.

These permissions should not be used by 3rd parties but
if they were, this change will break them.

I don't know the reason these were not in GSF and 'signature'
to begin with. If someone does, please, comment.

Change-Id: I6c4e4c774fea12c7fe7082477c210ad75f007c66
 2015-06-11 11:48:56 -07:00
Jeff Sharkey
8a26514687 Merge "Selected count string needs plurals." into mnc-dev 2015-06-11 18:21:08 +00:00
Carlos Valdivia
ffb46022b3 Permissions: Fix account related permissions. 
Requires updating the docs in AccountManaager as well as the logic in
AccountManagerService.

MANAGE_ACCOUNTS, USE_CREDENTIALS, and AUTHENTCATE_ACCOUNTS are going
away. Where AUTHENTCATE_ACCOUNTS was required we now do signature
matching.

GET_ACCOUNTS is kept but has been grouped under contacts.

Bug: 20136477
Change-Id: Iabbb76dce8d1efc607c1f107911d7ddab598a481
 2015-06-11 11:07:47 -07:00
Dirk Dougherty
cbf63d8aba am 405d58ff: am fd743227: Merge "Doc change: Remove disallow /preview from indexing." into mnc-preview-docs 
* commit '405d58fff8a64833f365893d065edf3d17f60f21':
  Doc change: Remove disallow /preview from indexing.
 2015-06-11 17:57:37 +00:00
Hyungtae Tim Kim
d15e2c62e8 Merge "Add bucket that unknown state playback falls into" into mnc-dev 2015-06-11 17:53:17 +00:00
Craig Lafayette
77b2d49abb Merge "Remove device initializer status messages" into mnc-dev 2015-06-11 17:45:03 +00:00
Dirk Dougherty
405d58fff8 am fd743227: Merge "Doc change: Remove disallow /preview from indexing." into mnc-preview-docs 
* commit 'fd7432276172790a27bd51b75e61d756772eb33b':
  Doc change: Remove disallow /preview from indexing.
 2015-06-11 17:40:53 +00:00
Alex Klyubin
96d7058aaa Merge "Android Keystore keys are no longer backed by Conscrypt." into mnc-dev 2015-06-11 17:40:09 +00:00
Dirk Dougherty
fd74322761 Merge "Doc change: Remove disallow /preview from indexing." into mnc-preview-docs 2015-06-11 17:31:46 +00:00
Adam Powell
98b40aac83 Merge "Disable ResolverComparator's debug logging" into mnc-dev 2015-06-11 17:14:04 +00:00
Adam Powell
064139434d Disable ResolverComparator's debug logging 
Change-Id: Ic1df5a7caaadf7076436cbcec6e79bb14ffa1c81
 2015-06-11 10:08:03 -07:00
Joe Fernandez
3e634d9358 am fd7a6b03: am d1d8b843: Merge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-preview-docs 
* commit 'fd7a6b03329606caa4e61eab64435b6407c90bf2':
  Revert "Revert "docs: studio 1.2.2.0 updates""
 2015-06-11 16:47:20 +00:00
Joe Fernandez
fd7a6b0332 am d1d8b843: Merge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-preview-docs 
* commit 'd1d8b843dd4b7575438339a15e610deafa060f76':
  Revert "Revert "docs: studio 1.2.2.0 updates""
 2015-06-11 16:33:02 +00:00
Adrian Roos
a6e772c822 Merge "Follow-up to I7d96ca46a41ec764984be5fe42d225cb94f53497" into mnc-dev 2015-06-11 16:24:38 +00:00
Joe Fernandez
d1d8b843dd Merge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-preview-docs 2015-06-11 16:24:26 +00:00
Adrian Roos
5b56be6089 Merge "Filter hover events for clipped views" into mnc-dev 2015-06-11 16:24:11 +00:00
Jeff Sharkey
f491c72e4a Selected count string needs plurals. 
Bug: 21717427
Change-Id: Ie0db8ac30244b022ca5838969fb085230bfc4499
 2015-06-11 09:19:37 -07:00
Benjamin Franz
d168d184c0 Merge "Align the behaviour of different lock task modes" into mnc-dev 2015-06-11 16:15:37 +00:00
Jonathan Basseri
b2af4220ad Merge "Delete TODO and file a bug." into mnc-dev 2015-06-11 15:36:34 +00:00
Hyungtae Tim Kim
333578bcd4 Add bucket that unknown state playback falls into 
MediaPlayerStressTest some media files are missing on the results as they
were reported neither completed nor erroneous.
This case will fall into a new category named unknown playback state so that
we could track them in media dashboard.

Bug: 21755950
Change-Id: Iefcc3e375c63d952a7d9edb418208209d87b9e08
 2015-06-11 08:33:04 -07:00
Dan Sandler
31ae9936a6 Merge "A11y: Annotate the QS brightness slider properly." into mnc-dev 2015-06-11 14:55:02 +00:00
Dan Sandler
187fe17bba A11y: Annotate the QS brightness slider properly. 
Instead of just clobbering SeekBar's awesome feedback with
"Display brightness" right on the slider, we move that
string up to the parent and set it as the slider's label.

The new utterance will be: "<standard seekbar feedback> for
<label>", which in this case comes out as:

"Seek control, fifteen percent, for display brightness."

Bug: 20343730
Change-Id: I1223b3b07b6bf67ee3df22094ec5976b5188d968
 2015-06-11 10:49:28 -04:00
Jason Monk
08f247fe2e Merge "Fix rotation tile animation" into mnc-dev 2015-06-11 14:10:03 +00:00
John Spurlock
c110887c2a Merge "Volume: Disable seekbar prefs when zen muted." into mnc-dev 2015-06-11 14:08:48 +00:00
Joseph Wen
2dd827ae06 Merge "Update Statement Service" into mnc-dev 2015-06-11 13:59:30 +00:00
Jason Monk
6215478e56 Fix rotation tile animation 
Don't call setAllowAnimation unless there is a state change.
Also don't bother updating the rest of the state as it hasn't
changed.

Bug: 21337755
Change-Id: Ia3357e075c8e65fdb83232b685332c98e16c291d
 2015-06-11 09:23:16 -04:00
Kenny Guy
fd9a2dafdc Merge "New look and feel for managed profile toast" into mnc-dev 2015-06-11 11:06:56 +00:00
Svet Ganov
5772b5c671 Propagete document meta-data to custom print UI. 
Change-Id: I3f122224e1b311a222969253ae0336177989a414
 2015-06-11 03:32:09 -07:00
Svet Ganov
e545bd36a4 Merge "Permission group is granted if one permission is granted for UI purposes." into mnc-dev 2015-06-11 08:17:43 +00:00
Svet Ganov
1ed0e553c6 Permission group is granted if one permission is granted for UI purposes. 
bug:21761217

Change-Id: I02c78225e3883106565d304d5b268e496bca7d89
 2015-06-11 01:17:07 -07:00
Selim Cinek
056b131ca8 Merge "Added strings to explain why the security method needs to be solved" into mnc-dev 2015-06-11 08:12:51 +00:00
Chris Banes
dbdaa9b41e Merge "API council review feedback for ActionMenuView" into mnc-dev 2015-06-11 08:05:42 +00:00
Svetoslav
75a0ee081f Merge "Add system API to watch for permission changes" into mnc-dev 2015-06-11 08:02:06 +00:00
Selim Cinek
56a44628b5 Added strings to explain why the security method needs to be solved 
Bug: 21618072
Change-Id: I4feca6a597610b09dc4399ff2e9962d0928f46c0
 2015-06-11 00:37:18 -07:00
Daichi Hirono
4ba81a0878 Merge "Update visibility of the stack dropdown list after the search view is collapsed." into mnc-dev 2015-06-11 05:31:40 +00:00
Robert Greenwalt
c34f2f15df Merge "Add logging to help debug this issue." into mnc-dev 2015-06-11 05:30:37 +00:00
Daichi Hirono
186efa3836 Update visibility of the stack dropdown list after the search view is collapsed. 
Previously we hid the stack dropdown list just before the action bar is
collapsed. Then the dropdown list gets back to be visible when the action bar is
collapsed.

The CL updates visibility of the stack dropdown list just after the action bar
is collapsed.

BUG=20945584
Change-Id: Iaf5055bce101f8134accd311829e50f441ddc98b
 2015-06-11 14:29:28 +09:00
Robert Greenwalt
3d68dee119 Add logging to help debug this issue. 
Shows:
TelephonyNetworkFactories:
    {TelephonyNetworkFactory - ScoreFilter=50, Filter=[ Transports:
    CELLULAR Capabilities: MMS&SUPL&DUN&FOTA&IMS&CBS&IA&RCS&XCAP&EIMS&
    INTERNET&NOT_RESTRICTED&TRUSTED&NOT_VPN Specifier: <2>],
    requests=1, refCount=0}
        {NetworkRequest [ id=1, legacyType=-1, [ Capabilities:
        INTERNET&NOT_RESTRICTED&TRUSTED&NOT_VPN] ], score=50, requested=true}

bug:20731384
Change-Id: I6a38f195609ad01ff2a2584d07945540ae421586
 2015-06-10 22:17:49 -07:00
Jeff Brown
40dbedfb1a Fix MediaBrowser.getItem() API inconsistencies, again. 
Bug: 21668207
Change-Id: I2439179e5e551b5628a1d2044f43a9df74d4240c
 2015-06-10 22:15:54 -07:00