Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
212,281 Commits 3 Branches 0 Tags
ebdf60e7c800b2ccda01887a304ddc0edce0361d
Commit Graph

6362 Commits

Author SHA1 Message Date
Jeff Sharkey
8cbd7c8a8a am 8feaed95: am da5d9af8: am fe45f1b9: Merge "Default location is "internalOnly" when undefined." into mnc-dr-dev 
* commit '8feaed95cfc79cc96a0c0a18c3db8154dd9f551a':
  Default location is "internalOnly" when undefined.
 2015-10-12 16:55:52 +00:00
Jeff Sharkey
da5d9af805 am fe45f1b9: Merge "Default location is "internalOnly" when undefined." into mnc-dr-dev 
* commit 'fe45f1b97a1f572ce453193035f1fabf7957cc03':
  Default location is "internalOnly" when undefined.
 2015-10-12 16:39:29 +00:00
Jeff Sharkey
c88a2d5b33 Default location is "internalOnly" when undefined. 
When an app doesn't define installLocation, the default behavior
should be to treat it as internal only.  This matches all the
published developer documentation.

Without this, apps could be unwittingly be moved to adopted storage
devices.

Bug: 24771264
Change-Id: Iaf38ab45329aad6cb5d6deac81fb1781f680189b
 2015-10-09 13:22:09 -07:00
Ned Burns
99fa24ff71 am 11b87b91: am 1b69fcbf: am f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed 
* commit '11b87b9109717b30729e2ce01ac5014ba91c1051':
  Kill ActivityView's background thread when it's destroyed
 2015-09-26 06:54:22 +00:00
Ned Burns
1b69fcbf81 am f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed 
* commit 'f4e1d10cd35a4c1f87ec6dc3e59a9d08e562ffca':
  Kill ActivityView's background thread when it's destroyed
 2015-09-25 21:10:09 +00:00
Jorim Jaggi
c594e9354a am f9f9999d: am b7b9b31f: am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev 
* commit 'f9f9999d3245dffc8463a1f3f5f74dc900aa0196':
  Deliver camera launch source for analytics
 2015-09-25 18:07:52 +00:00
Jorim Jaggi
b7b9b31f69 am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev 
* commit 'ad26dc5f15d6ac13741ad8724c25ef8c58e73e81':
  Deliver camera launch source for analytics
 2015-09-25 01:30:43 +00:00
Jorim Jaggi
40aa8811bc Deliver camera launch source for analytics 
Bug: 24304031
Change-Id: I606bccf4b62b651e17c6e6d9472648deeab703da
 2015-09-24 16:32:09 -07:00
Ned Burns
f4e1d10cd3 Kill ActivityView's background thread when it's destroyed 
We were leaking background threads for every new ActivityView.

Change-Id: I7ce190843265567984f6cda9c85fef478b0ead38
 2015-09-23 20:19:16 -04:00
Todd Kennedy
898e6973ca am 739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev 
* commit '739bb7c694aee521995100c456cf1c8341820bec':
  save "retain loader" state
 2015-09-23 18:05:58 +00:00
Todd Kennedy
e16fb554dd save "retain loader" state 
We cannot pull the "retain loader" state from the Activity; an Activity may
not always be hosting a Fragment. Instead, save the "retain loader" state
inside the individual fragments.

Bug: 23838271
Change-Id: I8358183a7689b5a571ea7be03d769186b2812600
 2015-09-22 10:16:42 -07:00
Todd Kennedy
d65fc9c460 am d8b47855: save "retain loader" state DO NOT MERGE 
* commit 'd8b47855a316700751f7daead0b180005853be33':
  save "retain loader" state DO NOT MERGE
 2015-09-22 07:27:18 +00:00
Todd Kennedy
d8b47855a3 save "retain loader" state DO NOT MERGE 
We cannot pull the "retain loader" state from the Activity; an Activity may
not always be hosting a Fragment. Instead, save the "retain loader" state
inside the individual fragments.

Bug: 23838271
Change-Id: I8358183a7689b5a571ea7be03d769186b2812600
(cherry picked from commit c5ac16f531)
 2015-09-22 07:19:14 +00:00
Alex Hills
d04c6d19a5 resolved conflicts for 693e11e5 to mnc-dr-dev-plus-aosp 
Change-Id: I701841759a80f434a09b086492e817ca23a6a2e6
 2015-09-14 17:03:58 -04:00
Alexander Hills
6a261fd653 Merge "Cherry-pick system theme rebase to fix square UI on round watches" into cw-e-dev 2015-09-14 18:34:32 +00:00
Alan Viverette
3d2337eeb5 Cherry-pick system theme rebase to fix square UI on round watches 
Our system themes were based on configurations that were added post-
init of the system theme.

I96e695441543379e4d5fdf3cc6f18d9e6cf953b4 broke this, because there
was a race condition in the code for rebasing themes

If8fecde76d62738a8e55eddf898eafc468afdba2 (the cherry-picked commit)
fixes the race condition and adds the rebasing back in.

This change cherry picks If8fecde76d62738a8e55eddf898eafc468afdba2.

Bug:23387146
Change-Id: I0725028e48599fc6cd9731ae16c71474dd5827e5
 2015-09-14 10:56:02 -04:00
Gus Prevas
94a4764649 am 27cb5670: am 3d1115db: Merge "Fixes cloned notification actions missing icon." into cw-e-dev 
* commit '27cb56703d350b441a2e9efc55bd16dd5b1528e7':
  Fixes cloned notification actions missing icon.
 2015-09-10 19:54:13 +00:00
Gus Prevas
3d1115dba5 Merge "Fixes cloned notification actions missing icon." into cw-e-dev 2015-09-10 19:40:19 +00:00
Gus Prevas
f5bff46f6a Fixes cloned notification actions missing icon. 
This change modifies the Notification.Action constructor
to populate the deprecated "icon" field based on the provided icon.
This field is still used by NotificationCompatApi20
to create a NotificationCompatBase.Action from a Notification.Action.

Bug: 23348968
Bug: 22591778
Change-Id: I3576038384d2baa12c4c75bc4124e3859aacbd13
 2015-09-10 13:13:45 -04:00
Svetoslav Ganov
5f677b114c am 4f1bd159: am db4efcfa: am f57d9856: am 4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev 
* commit '4f1bd159d9042106d112cbf579c2daf82842f375':
  Add get_accounts app op
 2015-09-09 02:08:18 +00:00
Svetoslav Ganov
db4efcfa8d am f57d9856: am 4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev 
* commit 'f57d98564b26953b722ab0e14222f50e6515f36d':
  Add get_accounts app op
 2015-09-09 01:51:37 +00:00
Svetoslav Ganov
f57d98564b am 4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev 
* commit '4f7d0bc7af5fbb65796d24b130b7e9e63107bc5d':
  Add get_accounts app op
 2015-09-09 01:42:56 +00:00
Svetoslav
ce852ddcec Add get_accounts app op 
For each runtime permission we have an app op to toggle the
permission for legacy apps as they cannot handle permission
revocations. We were lacking an app op for get_accounts
which prevented the user from controlling access to accounts
regardelss that they change the state of the permission
toggle in the UI. Even worse the permission UI is written
with the assumption that every runtime permission has an
app op and as a result revoking the contacts group (if the
app requests the get_accounts permission) is reset back to
allowed in the UI.

bug:23854618

Change-Id: I9e3f9bfeb320bed561d718db99ee285915d5701b
 2015-09-08 17:54:37 -07:00
Todd Kennedy
dde3fd6585 am f7bf24ad: am 9fe274d6: am 9e25e164: am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev 
* commit 'f7bf24ad1d780b326287409f37e0e8c03115f60d':
  Ensure host is set before onInflate()
 2015-08-31 23:14:54 +00:00
Todd Kennedy
9fe274d638 am 9e25e164: am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev 
* commit '9e25e1645f5e436c88ceab7d7eaf9f21c7fa845b':
  Ensure host is set before onInflate()
 2015-08-31 22:57:52 +00:00
Todd Kennedy
9e25e1645f am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev 
* commit 'e7078e181cd00d20ce7764efa9835e2604a3cb83':
  Ensure host is set before onInflate()
 2015-08-31 22:45:23 +00:00
Todd Kennedy
0aa69b7dc5 Ensure host is set before onInflate() 
Bug: 22512520
Change-Id: I70f3b3c3234d7015880e0b83ae13f6fbe218f19a
 2015-08-31 14:10:04 -07:00
Adrian Roos
bcc26c0201 am 69fd61cb: am a8bbebd4: am b5e47228: Add StrongAuthTracker 
* commit '69fd61cb9a487e5993098c93113d86c4fb32c304':
  Add StrongAuthTracker
 2015-08-22 00:40:47 +00:00
Adrian Roos
a8bbebd426 am b5e47228: Add StrongAuthTracker 
* commit 'b5e4722891e7bbf2fffcd995af02838667a3abab':
  Add StrongAuthTracker
 2015-08-22 00:16:48 +00:00
Adrian Roos
b5e4722891 Add StrongAuthTracker 
Bug: 22846469
Bug: 22115393
Change-Id: I6ef5322d02e540fc043e7f20d3aabf595ce7c224
 2015-08-21 13:28:00 -07:00
Esteban Talavera
12e42ba225 am 31638de3: am 07b36bd3: am aed1c9fb: am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev 
* commit '31638de30564d5b5fdc4177227cdab6df681ecfc':
  Remove uids with empty history from NetworkStats uid enumeration
 2015-08-17 15:14:04 +00:00
Esteban Talavera
07b36bd3bf am aed1c9fb: am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev 
* commit 'aed1c9fbc5c4f77bfc8c44fb7bd87bbdb6dc0174':
  Remove uids with empty history from NetworkStats uid enumeration
 2015-08-17 15:00:04 +00:00
Esteban Talavera
5d467ac54a Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev 2015-08-17 14:47:49 +00:00
Svetoslav Ganov
f64014195b am 340314fd: am 7c3d595a: am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 
* commit '340314fd0306f24fe8e4047b8feede071aadfb97':
  Add GTS test to ensure valid default permission grants - framework
 2015-08-14 15:36:40 +00:00
Zoltan Szatmary-Ban
887cffea24 Remove uids with empty history from NetworkStats uid enumeration 
Bug: 23018174
Change-Id: I1a482280599e0f5da18a208e727653d4bd4107ec
 2015-08-14 16:21:52 +01:00
Svetoslav Ganov
7c3d595a3d am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 
* commit '4b655fd193992afff948df513c7b9b9a0389972e':
  Add GTS test to ensure valid default permission grants - framework
 2015-08-14 15:19:47 +00:00
Svetoslav Ganov
b045331fcb Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 2015-08-14 15:06:16 +00:00
Jeff Sharkey
e7ed65eb45 am 4efd3f26: am d28991a5: am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev 
* commit '4efd3f26ac515f85adde2979ec1d8d68218fc470':
  Method to show DialogFragment allowing state loss.
 2015-08-14 03:19:00 +00:00
Jeff Sharkey
d28991a5e4 am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev 
* commit 'b6f5bcd0c64676ad2dfddc9dcf4c4320fafb9d3a':
  Method to show DialogFragment allowing state loss.
 2015-08-14 01:35:40 +00:00
Jeff Sharkey
063f850060 Method to show DialogFragment allowing state loss. 
Same as show(), but allowing state loss.

Bug: 22867250
Change-Id: Ib779d8a3febc70ad47a9c1a9099d858707bad733
 2015-08-13 16:57:29 -07:00
Svet Ganov
52153f4c05 Add GTS test to ensure valid default permission grants - framework 
The platform grants runtime permissions by default to apps on the
system image that provide core device use cases which a user expects
to work out-of-the-box. We are now adding a test to ensure that
OEMs cannot pregrant premissions on non approved components.

bug:23043018

Change-Id: Id76717cce0ee59678956bd0be347d3c045fe4c51
 2015-08-12 21:57:59 -07:00
Alan Viverette
4304d9ac96 am b2087fa8: am f3d04cbf: am bb03bf05: am 105febd2: Merge "Don\'t re-wrap alert dialog context" into mnc-dev 
* commit 'b2087fa81ccbf4214de31b324ff0106f2363d02d':
  Don't re-wrap alert dialog context
 2015-08-11 20:02:36 +00:00
Alan Viverette
f3d04cbfe6 am bb03bf05: am 105febd2: Merge "Don\'t re-wrap alert dialog context" into mnc-dev 
* commit 'bb03bf055437c21180026b8c8227c52ca2809286':
  Don't re-wrap alert dialog context
 2015-08-11 19:48:00 +00:00
Alan Viverette
105febd2cf Merge "Don't re-wrap alert dialog context" into mnc-dev 2015-08-11 19:34:27 +00:00
Alan Viverette
93d9e26ffb Don't re-wrap alert dialog context 
Bug: 23038618
Change-Id: Iafe3a45096153d9fe656ad930cc3978d8fab1968
 2015-08-11 15:02:42 -04:00
Alan Viverette
3e384531be am 1743988c: am 6c3a468c: am e720297f: am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev 
* commit '1743988cd7647af8c64c961d4ca5e9d4b4b7bc00':
  Avoid use-after-free race condition when rebasing theme
 2015-08-11 18:53:13 +00:00
Alan Viverette
6c3a468cf3 am e720297f: am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev 
* commit 'e720297fd89d39325a34f0d8f54e55971aec7269':
  Avoid use-after-free race condition when rebasing theme
 2015-08-11 18:38:21 +00:00
Alan Viverette
b4eb06402f Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev 2015-08-11 18:24:04 +00:00
Alan Viverette
c12ec70def Avoid use-after-free race condition when rebasing theme 
... by never rebasing the theme. We don't need to do this unless the
system theme is configuration-dependent, which it is not currently.

Bug: 22943781
Change-Id: I96e695441543379e4d5fdf3cc6f18d9e6cf953b4
 2015-08-11 10:26:08 -04:00
Esteban Talavera
6f4de12870 am 84bd2172: am 8e85fdfe: am 467951ee: am 4dbb37ae: Merge "Update setApplicationRestrictions documentation" into mnc-dev 
* commit '84bd2172ea42dc6681bcf4f96e19a3f5fd928b41':
  Update setApplicationRestrictions documentation
 2015-08-11 10:30:33 +00:00