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

202876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
1353b0f5e6 am 6bf21c3a: am b762a9a5: am bb55aa1a: Merge "Fixing issue with empty Recents screen." into mnc-dev 
* commit '6bf21c3a06c9f08a650d5f2aadd29389c636fb1e':
  Fixing issue with empty Recents screen.
 2015-08-06 22:08:33 +00:00
Winson Chung
6bf21c3a06 am b762a9a5: am bb55aa1a: Merge "Fixing issue with empty Recents screen." into mnc-dev 
* commit 'b762a9a579eb4dd8f58932d4f1284cae7727cd00':
  Fixing issue with empty Recents screen.
 2015-08-06 22:01:25 +00:00
Winson Chung
b762a9a579 am bb55aa1a: Merge "Fixing issue with empty Recents screen." into mnc-dev 
* commit 'bb55aa1a93cee91a40b6f5941675682cb6f8a83b':
  Fixing issue with empty Recents screen.
 2015-08-06 21:53:03 +00:00
Wei Jia
d385c56dc3 am 9bf7f2a4: am be30c10e: am a89e9f6d: Merge "MediaSync: fix API comments." into mnc-dev 
* commit '9bf7f2a41f32d4ffb2e5b557a6c79fc4460c4576':
  MediaSync: fix API comments.
 2015-08-06 21:51:48 +00:00
Winson Chung
bb55aa1a93 Merge "Fixing issue with empty Recents screen." into mnc-dev 2015-08-06 21:44:17 +00:00
Wei Jia
9bf7f2a41f am be30c10e: am a89e9f6d: Merge "MediaSync: fix API comments." into mnc-dev 
* commit 'be30c10ede99b8ca971af4d735d6c0e42778879b':
  MediaSync: fix API comments.
 2015-08-06 21:43:05 +00:00
Wei Jia
be30c10ede am a89e9f6d: Merge "MediaSync: fix API comments." into mnc-dev 
* commit 'a89e9f6d3207527888d7fab191ddbe92ff68fc79':
  MediaSync: fix API comments.
 2015-08-06 21:37:22 +00:00
Wei Jia
a89e9f6d32 Merge "MediaSync: fix API comments." into mnc-dev 2015-08-06 21:31:22 +00:00
Wei Jia
5d177fff2f MediaSync: fix API comments. 
Bug: 23008551

Change-Id: Ifbf1970c174b54a761d4672d954ee5633adbf3d6
 2015-08-06 12:51:36 -07:00
Winson
76ffdafc3c Fixing issue with empty Recents screen. 
- We did not expect RecentsActivity to be launched without going through
  the normal SystemUI controls, but when the home activity is in the foreground
  and killed (via a normal apk update), the RecentsActivity stores the old
  launch configuration and believes that it was launched from home and awaits
  the animation-complete callback to animate the tasks in.
- This CL adds a workaround where the configuration is reset whenever
  RecentsActivity is stopped, which allows the tasks to be shown immediately
  if the User is kicked back into Recents due to an update.

Bug: 22542869
Change-Id: I2b4168ccecfbf868fa6d544fe89109dfa74f51df
 2015-08-06 12:51:26 -07:00
Jeff Sharkey
48697332c7 am 0c2df694: am 7d28ad9b: am cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev 
* commit '0c2df6944c83eee291f3b8e588eed7adba401d46':
  Protect runtime storage mount points.
 2015-08-06 19:49:35 +00:00
Jeff Sharkey
0c2df6944c am 7d28ad9b: am cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev 
* commit '7d28ad9b638a8184ab499cbe708d3427025e569b':
  Protect runtime storage mount points.
 2015-08-06 19:43:57 +00:00
Jeff Sharkey
7d28ad9b63 am cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev 
* commit 'cb54ffb2cb9583eaf6b58dcc636681c4e4e07a7d':
  Protect runtime storage mount points.
 2015-08-06 19:36:01 +00:00
Chris Wren
fd18fc8686 am 8a38babb: am 062130d9: am 93f3fc87: Merge "add metrics to assistant" into mnc-dev 
* commit '8a38babb500d1b061fcf95b5d8e875bfca5c8c14':
  add metrics to assistant
 2015-08-06 19:32:49 +00:00
Benjamin Franz
f7a2eb5a8a am a17c5bac: am dc89dafa: am 339a9bbf: Merge "Use realActivity as indicator for task locking" into mnc-dev 
* commit 'a17c5bac6efff8365c1f2019311778413598e37c':
  Use realActivity as indicator for task locking
 2015-08-06 19:32:43 +00:00
Svetoslav Ganov
37a8bf6141 am cee66550: am 8695ec34: am 38c0fbda: Merge "Pregrant unrevokable storage permission to the CertInstaller" into mnc-dev 
* commit 'cee6655097d174f25fa21b6c2e80a3bbe54aae7e':
  Pregrant unrevokable storage permission to the CertInstaller
 2015-08-06 19:32:37 +00:00
Chris Wren
8a38babb50 am 062130d9: am 93f3fc87: Merge "add metrics to assistant" into mnc-dev 
* commit '062130d95d239d42a9ac3bd6211c70ca61cd3b89':
  add metrics to assistant
 2015-08-06 19:28:33 +00:00
Benjamin Franz
a17c5bac6e am dc89dafa: am 339a9bbf: Merge "Use realActivity as indicator for task locking" into mnc-dev 
* commit 'dc89dafaa3d95fe88eaa82b888098ffe9f07e4f5':
  Use realActivity as indicator for task locking
 2015-08-06 19:28:29 +00:00
Jeff Sharkey
cb54ffb2cb Merge "Protect runtime storage mount points." into mnc-dev 2015-08-06 19:27:42 +00:00
Chris Wren
062130d95d am 93f3fc87: Merge "add metrics to assistant" into mnc-dev 
* commit '93f3fc876639cd23ff176cba2e1f8f08df6f3fb5':
  add metrics to assistant
 2015-08-06 19:25:08 +00:00
Svetoslav Ganov
cee6655097 am 8695ec34: am 38c0fbda: Merge "Pregrant unrevokable storage permission to the CertInstaller" into mnc-dev 
* commit '8695ec34cf0460ec7687b578475d71c4c09cb773':
  Pregrant unrevokable storage permission to the CertInstaller
 2015-08-06 19:23:08 +00:00
Paul Mclean
97f294f5a6 am 5ccd64b4: am 80688be6: am af7748ef: Merge "Consider channel index masks when calculating channel counts." into mnc-dev 
* commit '5ccd64b46e548dd7bc4d5252f640c0406e955e5c':
  Consider channel index masks when calculating channel counts.
 2015-08-06 19:22:27 +00:00
Paul Mclean
1b8f8ac8fe am 4463053e: am a154b332: am c770b7a5: Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev 
* commit '4463053e79a39deaacef3035543df778d6ed3df1':
  Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test.
 2015-08-06 19:22:20 +00:00
Benjamin Franz
dc89dafaa3 am 339a9bbf: Merge "Use realActivity as indicator for task locking" into mnc-dev 
* commit '339a9bbf6d6544b516d6dbbae874d02f3ef7a6a4':
  Use realActivity as indicator for task locking
 2015-08-06 19:20:38 +00:00
Chris Wren
93f3fc8766 Merge "add metrics to assistant" into mnc-dev 2015-08-06 19:18:17 +00:00
Benjamin Franz
339a9bbf6d Merge "Use realActivity as indicator for task locking" into mnc-dev 2015-08-06 19:15:29 +00:00
Paul Mclean
5ccd64b46e am 80688be6: am af7748ef: Merge "Consider channel index masks when calculating channel counts." into mnc-dev 
* commit '80688be665c7cff4b53217422a0ec13b0c0272da':
  Consider channel index masks when calculating channel counts.
 2015-08-06 19:14:14 +00:00
Paul Mclean
4463053e79 am a154b332: am c770b7a5: Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev 
* commit 'a154b332ab2fdcb541079a2b7c23932371c1f69f':
  Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test.
 2015-08-06 19:14:10 +00:00
Svetoslav Ganov
8695ec34cf am 38c0fbda: Merge "Pregrant unrevokable storage permission to the CertInstaller" into mnc-dev 
* commit '38c0fbda53399ac888e112d235e217fea220c2b7':
  Pregrant unrevokable storage permission to the CertInstaller
 2015-08-06 19:12:25 +00:00
Chris Wren
a35c96eb90 add metrics to assistant 
long press
  screenshot enabled
  context enabled

Bug: 22949579
Change-Id: Iac178207fa7149cda03c9a817a0d1450e46e1c59
 2015-08-06 15:11:42 -04:00
Svetoslav Ganov
38c0fbda53 Merge "Pregrant unrevokable storage permission to the CertInstaller" into mnc-dev 2015-08-06 19:08:33 +00:00
Paul Mclean
80688be665 am af7748ef: Merge "Consider channel index masks when calculating channel counts." into mnc-dev 
* commit 'af7748efb6cf4ecca07ab7a76b678a04387e2e40':
  Consider channel index masks when calculating channel counts.
 2015-08-06 19:06:15 +00:00
Paul Mclean
a154b332ab am c770b7a5: Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev 
* commit 'c770b7a537350930dab6489c1e2a6f7e46dc47d1':
  Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test.
 2015-08-06 19:06:11 +00:00
Paul Mclean
af7748efb6 Merge "Consider channel index masks when calculating channel counts." into mnc-dev 2015-08-06 18:59:06 +00:00
Paul Mclean
c770b7a537 Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev 2015-08-06 18:58:33 +00:00
Jeff Sharkey
928e1ecfe2 Protect runtime storage mount points. 
We have a bunch of magic that mounts the correct view of storage
access based on the runtime permissions of an app, but we forgot to
protect the real underlying data sources; oops.

This series of changes just bumps the directory heirarchy one level
to give us /mnt/runtime which we can mask off as 0700 to prevent
people from jumping to the exposed internals.

Also add CTS tests to verify that we're protecting access to
internal mount points like this.

Bug: 22964288
Change-Id: I74dbdcb01d4fabe92166b8043a74c6a1e93c6d5f
 2015-08-06 11:46:30 -07:00
Alan Viverette
3fd42737b7 am 8a782c9d: am db576e1d: am c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev 
* commit '8a782c9de46cd770a421e4523900584343c8a631':
  Update anchor background on the correct view in PopupWindow
 2015-08-06 18:12:24 +00:00
Alan Viverette
8a782c9de4 am db576e1d: am c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev 
* commit 'db576e1d0cead619164afacefdb6215194285a32':
  Update anchor background on the correct view in PopupWindow
 2015-08-06 18:02:47 +00:00
Alan Viverette
db576e1d0c am c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev 
* commit 'c7f8133fa1ff78fea5a54974b5987791cb012f84':
  Update anchor background on the correct view in PopupWindow
 2015-08-06 17:55:38 +00:00
Alan Viverette
c7f8133fa1 Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev 2015-08-06 17:48:22 +00:00
Benjamin Franz
6fd84cc878 Use realActivity as indicator for task locking 
When lock task mode is started, we verify that the package is
whitelisted and currently use mCallingPackage as indicator. However,
the calling package is not necessarily identical to the package trying
to lock itself, so lock task mode sometimes fails. Switching over to
using realActivity as package marker.

Bug: 22916291
Change-Id: Ifd4df2d634842c8106b0b0f690bcf1faba0ed5fa
 2015-08-06 18:09:03 +01:00
Dianne Hackborn
aacc797809 am 41dfffb3: am db6a6a21: am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev 
* commit '41dfffb3578f5924923c5ed490285f5f3776c892':
  Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
 2015-08-06 17:06:47 +00:00
Dianne Hackborn
41dfffb357 am db6a6a21: am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev 
* commit 'db6a6a215e9f55b9413e18ca9c67aa3ef31bbefb':
  Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
 2015-08-06 17:00:47 +00:00
Dianne Hackborn
db6a6a215e am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev 
* commit '6b0f1e78b841a32b45f513d283202e3af90c6a73':
  Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
 2015-08-06 16:53:56 +00:00
Dianne Hackborn
6b0f1e78b8 Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev 2015-08-06 16:48:34 +00:00
Chet Haase
f7d8577ed0 am 42c70645: am aed2e8ba: am da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev 
* commit '42c70645d28f07db145e02fd4a11af99c6437936':
  Avoid changing internal state of shared drawable
 2015-08-06 16:44:32 +00:00
Chet Haase
42c70645d2 am aed2e8ba: am da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev 
* commit 'aed2e8baedd9cf3fb4472d4215dc9b15da390a94':
  Avoid changing internal state of shared drawable
 2015-08-06 16:38:02 +00:00
Alan Viverette
697804e8de Update anchor background on the correct view in PopupWindow 
We were always setting the background of the decor view when the
"above anchor" state changed, rather than the background view.

Bug: 22970244
Change-Id: I3cd7202767ee47cb415736bb3c07369801abccd8
 2015-08-06 12:36:47 -04:00
Chet Haase
aed2e8baed am da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev 
* commit 'da493aa6eab24de98b63cc63c457f5b899da3ad2':
  Avoid changing internal state of shared drawable
 2015-08-06 16:29:33 +00:00
Chet Haase
da493aa6ea Merge "Avoid changing internal state of shared drawable" into mnc-dev 2015-08-06 16:23:20 +00:00