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

199621 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Davidson
22d207747f am 20de377b: am 1d7c3254: Merge "Correctly propagate permissions when uninstalling updates." into mnc-dev 
* commit '20de377beb17273a2d2dcd5715c418eec1ac897e':
  Correctly propagate permissions when uninstalling updates.
 2015-08-07 01:55:07 +00:00
Jeff Davidson
20de377beb am 1d7c3254: Merge "Correctly propagate permissions when uninstalling updates." into mnc-dev 
* commit '1d7c32548c30c62a35c54a624f89d5f9db31b9d4':
  Correctly propagate permissions when uninstalling updates.
 2015-08-07 01:46:58 +00:00
Jeff Davidson
1d7c32548c Merge "Correctly propagate permissions when uninstalling updates." into mnc-dev 2015-08-07 01:39:14 +00:00
Wale Ogunwale
10068894a2 am 60f7eb38: am a0ef49c4: Look for recent tasks in live stacks. 
* commit '60f7eb38a9afdae504ce4412afe862e759fd8ff3':
  Look for recent tasks in live stacks.
 2015-08-07 01:23:01 +00:00
Wale Ogunwale
60f7eb38a9 am a0ef49c4: Look for recent tasks in live stacks. 
* commit 'a0ef49c44f7d845e3465591ea977d0c9996c4e5e':
  Look for recent tasks in live stacks.
 2015-08-07 01:13:35 +00:00
Wale Ogunwale
a0ef49c44f Look for recent tasks in live stacks. 
It is possible for a tasks not to have been saved to the
persisted recent list yet for various reasons. This causes
some external calls to fail when they are trying to do
an operation on a task with a given id. We now use the
stack supervisor look-up for a task id that checks
everywhere a task might be including live stack. It this
fails then the task truly doesn't exist.

Bug: 22924782
Change-Id: I57c3df41d0b4f3ee3c5ae9b7d01eeb2b352062b4
 2015-08-07 00:26:01 +00:00
Deepanshu Gupta
fbdf203254 am cfe5778d: am 8f26616d: Merge "LayoutLib: Switch SimpleDateFormat to icu." into mnc-dev 
* commit 'cfe5778de871615e8b78bbabb5404dc136774be8':
  LayoutLib: Switch SimpleDateFormat to icu.
 2015-08-06 23:42:02 +00:00
Deepanshu Gupta
cfe5778de8 am 8f26616d: Merge "LayoutLib: Switch SimpleDateFormat to icu." into mnc-dev 
* commit '8f26616d1a1765267d6a3ba09e7ac1bd6edeca67':
  LayoutLib: Switch SimpleDateFormat to icu.
 2015-08-06 23:32:27 +00:00
Deepanshu Gupta
2081769f4c am 618d96da: am 385ce0a3: Merge "Replace Locale.getDefault with custom impl." into mnc-dev 
* commit '618d96da7893fad4012353233c1c45db4e9d62ba':
  Replace Locale.getDefault with custom impl.
 2015-08-06 23:26:38 +00:00
Deepanshu Gupta
8f26616d1a Merge "LayoutLib: Switch SimpleDateFormat to icu." into mnc-dev 2015-08-06 23:26:01 +00:00
Deepanshu Gupta
618d96da78 am 385ce0a3: Merge "Replace Locale.getDefault with custom impl." into mnc-dev 
* commit '385ce0a31dbdd4b4b1865755dbc4af157f72481c':
  Replace Locale.getDefault with custom impl.
 2015-08-06 23:16:25 +00:00
Deepanshu Gupta
385ce0a31d Merge "Replace Locale.getDefault with custom impl." into mnc-dev 2015-08-06 23:08:46 +00:00
Deepanshu Gupta
b556decf75 LayoutLib: Switch SimpleDateFormat to icu. 
Use ICU's implementation of SimpleDateFormat in LayoutLib. The format
patterns used are not supported by java.text.SimpleDateFormat.

The change required adding a mechanism for promoting visibility of
fields in the framework in the create tool.
TODO: Add additional tests in the create tool for this new
functionality.

Change-Id: Id0f4be41f9731c42a28919c32cc5ef271a656982
 2015-08-06 16:04:04 -07:00
Deepanshu Gupta
82c7fdb1f6 Replace Locale.getDefault with custom impl. 
In LayoutLib the default locale should always be the locale set the
rendering params. This change replaces all calls to Locale.getDefault in
the framework with calls to AndroidLocale.getDefault() which tries to
find the locale from the current context, but falls back to the original
call.

Change-Id: I496b35dcfc17fd61fedee21c7495541ab870b1fc
 2015-08-06 16:03:19 -07:00
Andres Morales
7ab11e45bd am 5fd47543: am 85c73c40: Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev 
* commit '5fd4754310a9b19c7b880197e5bd237e2959c040':
  [UserManager] expose method to retrieve credential owner
 2015-08-06 22:36:08 +00:00
Andres Morales
5fd4754310 am 85c73c40: Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev 
* commit '85c73c40d1fd76e8a7bbd90ab80458082764c1c3':
  [UserManager] expose method to retrieve credential owner
 2015-08-06 22:30:59 +00:00
Andres Morales
85c73c40d1 Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev 2015-08-06 22:22:17 +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
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
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
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
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
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
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