Commit Graph

10691 Commits

Author SHA1 Message Date
Chris Tate
dbcba09295 am 6baa88d5: am 87c3a63c: am 73c8a19d: am 5a626722: am a36c5580: Merge "Fix a bug disappearing installerPackageName info of packages after reboot." into mnc-dev
* commit '6baa88d5d35756f5141dd3dd684255ea4d0d2a16':
  Fix a bug disappearing installerPackageName info of packages after reboot.
2015-07-16 02:31:18 +00:00
Chris Tate
6baa88d5d3 am 87c3a63c: am 73c8a19d: am 5a626722: am a36c5580: Merge "Fix a bug disappearing installerPackageName info of packages after reboot." into mnc-dev
* commit '87c3a63c0c557ce4be5021733d8d4ae21cc0c3c0':
  Fix a bug disappearing installerPackageName info of packages after reboot.
2015-07-16 02:13:17 +00:00
Christopher Tate
a0bfc20635 am fdb71b60: am 374600c9: am 49af7ad4: am fbb4e9d2: am 3b1f8607: Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev
* commit 'fdb71b6041c7e4eba0410116799b276ab8ab83c5':
  Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
2015-07-16 01:32:04 +00:00
Billy Lau
dd46de68ad am 1178526c: am 0d360d17: am fa2584f6: am da93454b: am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev
* commit '1178526c352a6784b520cd10a3a5686f9427d1b9':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...
2015-07-16 01:31:56 +00:00
Chris Tate
5a6267226e am a36c5580: Merge "Fix a bug disappearing installerPackageName info of packages after reboot." into mnc-dev
* commit 'a36c5580c503da98c137c5bf9f52a719a131d2a9':
  Fix a bug disappearing installerPackageName info of packages after reboot.
2015-07-16 01:28:59 +00:00
Chris Tate
a36c5580c5 Merge "Fix a bug disappearing installerPackageName info of packages after reboot." into mnc-dev 2015-07-16 01:18:06 +00:00
Christopher Tate
fdb71b6041 am 374600c9: am 49af7ad4: am fbb4e9d2: am 3b1f8607: Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev
* commit '374600c93578ebdfc139e65ac6fb26c988b88d27':
  Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
2015-07-16 01:13:24 +00:00
Billy Lau
1178526c35 am 0d360d17: am fa2584f6: am da93454b: am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev
* commit '0d360d17a4307f32f3179ade4d3730d0a02d227d':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...
2015-07-16 01:13:18 +00:00
Dianne Hackborn
bebf8b3116 am cd917ecf: am 18587c55: am b5c44f90: am 709d013f: am 67e02e60: Merge "Fix issue #22487155: Device unresponsive (deadlock in system_server)" into mnc-dev
* commit 'cd917ecf0abb011916e9d90f526a2eff454bc1e7':
  Fix issue #22487155: Device unresponsive (deadlock in system_server)
2015-07-16 00:40:19 +00:00
Jim Miller
2fcb90f397 am 04bcd224: am 0483200d: am baa370e1: am db19e1de: Merge "Fix the build" into mnc-dr-dev
* commit '04bcd224ffcb5c8978ae47492ee692650b72a84c':
  Fix the build
2015-07-16 00:39:48 +00:00
Christopher Tate
fbb4e9d23f am 3b1f8607: Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev
* commit '3b1f8607fdc416a87e608499698719f3234ecc90':
  Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
2015-07-16 00:31:18 +00:00
Dianne Hackborn
cd917ecf0a am 18587c55: am b5c44f90: am 709d013f: am 67e02e60: Merge "Fix issue #22487155: Device unresponsive (deadlock in system_server)" into mnc-dev
* commit '18587c5511ce3304070d5ac77c112fccdde68e3b':
  Fix issue #22487155: Device unresponsive (deadlock in system_server)
2015-07-16 00:24:35 +00:00
Jim Miller
04bcd224ff am 0483200d: am baa370e1: am db19e1de: Merge "Fix the build" into mnc-dr-dev
* commit '0483200dc3c6345487fce09bf8ecaf34b0af89ee':
  Fix the build
2015-07-16 00:24:10 +00:00
Christopher Tate
29c0a82395 am a9fa3c24: am b3ed2b8b: am ec0ed98d: am b6b97e90: am 06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev
* commit 'a9fa3c24e0f013a345be935179579706f67d1f6c':
  Resolve based on the correct user's default browser
2015-07-16 00:21:55 +00:00
Billy Lau
da93454bfa am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev
* commit '008409a2ea1feed095d53ce51429e4fed964c50c':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...
2015-07-16 00:21:44 +00:00
Christopher Tate
3b1f8607fd Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev 2015-07-16 00:21:12 +00:00
hyemin.hwang
b4faf9810d Fix a bug disappearing installerPackageName info of packages after reboot.
If user install apps from playstore, system has installerPackageName attribute of app.
but, after reboot, some apps(have sharedUserID) installerPackageName attribute disappearing.
because lack of copy routine.
So, I added copy routine(installerPackageName).

Testcase :
1. Install app(has sharedUserId, ex Lync2013) from market.
2. Confirm package info from packages.xml(exist installer info).
3. reboot.
4. Re-confirm package info from packages.xml(not exist installer info).

Cherry-pick from AOSP master.
Bug 22513758

Change-Id: I3fea3e573c056f6c2f574715d2ebef4df8b75a68
2015-07-15 17:14:24 -07:00
Christopher Tate
a9fa3c24e0 am b3ed2b8b: am ec0ed98d: am b6b97e90: am 06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev
* commit 'b3ed2b8b6facfb512de5a2c4ad81ea5c5736d0a8':
  Resolve based on the correct user's default browser
2015-07-16 00:05:07 +00:00
Billy Lau
008409a2ea Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev 2015-07-16 00:04:35 +00:00
Christopher Tate
ac15b1b0c0 Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
Bug 22504009

Change-Id: I565b2ba4d1e5deeee8ede3363819deec206dbf58
2015-07-15 16:56:58 -07:00
Dianne Hackborn
709d013fd6 am 67e02e60: Merge "Fix issue #22487155: Device unresponsive (deadlock in system_server)" into mnc-dev
* commit '67e02e60ca58db95b397fde7bfeeebb012e8aff8':
  Fix issue #22487155: Device unresponsive (deadlock in system_server)
2015-07-15 23:39:27 +00:00
Billy Lau
060275ffc7 Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...
AppOpsManager:
Changed the default mode for SYSTEM_ALERT_WINDOW to MODE_DEFAULT instead of
MODE_ALLOWED. Otherwise, an app that did not declare for this permission will
actually be allowed to perform OP_SYSTEM_ALERT_WINDOW, which is undesirable.
This change also allows callers to make their own decision based on the
current policy (M vs pre-M apps).

policy/PhoneWindowManager:
Added additional checks that will handle MODE_DEFAULT - this happens when an app
is newly installed but not yet configured.

wm/WindowManagerService:
Enriched some checks to include the treatment of MODE_DEFAULT - this will allow
pre-M apps uninterupted capability to draw on top of other apps.

Change-Id: I8de77730e158c97587427820cfba721bd5607bea
2015-07-16 00:34:26 +01:00
Jim Miller
db19e1ded0 Merge "Fix the build" into mnc-dr-dev 2015-07-15 23:32:39 +00:00
Svet Ganov
5dc71cb2dd am ffb43184: am 3d8e949a: am 9088c083: am 12b05ec2: am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev
* commit 'ffb4318447f7741b4901dd38e3f6d97c94794b42':
  Grant default permissions to the setup app robustly.
2015-07-15 23:32:14 +00:00
Dianne Hackborn
67e02e60ca Merge "Fix issue #22487155: Device unresponsive (deadlock in system_server)" into mnc-dev 2015-07-15 23:31:02 +00:00
Jim Miller
de5b573e2a Fix the build
Build broken due to a bad merge.

Change-Id: Id10b3db5d1bde2a2c9e8995e35b4fc58c5468544
2015-07-15 16:29:30 -07:00
Svet Ganov
ffb4318447 am 3d8e949a: am 9088c083: am 12b05ec2: am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev
* commit '3d8e949a7767b204eb9504d3c5267de9e0fd6899':
  Grant default permissions to the setup app robustly.
2015-07-15 23:18:40 +00:00
Christopher Tate
b6b97e90cb am 06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev
* commit '06476508c4aae6b9bb5affdc7470abf159ef9eda':
  Resolve based on the correct user's default browser
2015-07-15 23:12:59 +00:00
Christopher Tate
06476508c4 Merge "Resolve based on the correct user's default browser" into mnc-dev 2015-07-15 22:57:53 +00:00
Jim Miller
aa1a35ba27 am 2e56339a: am bcedcde8: am 204c2de8: am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev
* commit '2e56339a4a1133e9aface1c851f1ab67cff72109':
  Improve tracking of screen on reasons.
2015-07-15 22:40:32 +00:00
Svet Ganov
12b05ec2e7 am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev
* commit '75f6b94a5d5cadb218725011729466e8e438b231':
  Grant default permissions to the setup app robustly.
2015-07-15 22:28:10 +00:00
Jim Miller
2e56339a4a am bcedcde8: am 204c2de8: am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev
* commit 'bcedcde8093b48c3d013cc57dde42bdd17d6dcb9':
  Improve tracking of screen on reasons.
2015-07-15 22:26:05 +00:00
Svet Ganov
75f6b94a5d Merge "Grant default permissions to the setup app robustly." into mnc-dev 2015-07-15 21:58:50 +00:00
Christopher Tate
7991f7813e Resolve based on the correct user's default browser
Bug 22509659

Change-Id: Iac75e7b40609bf2c81d266e0568fbfbeb71bb3aa
2015-07-15 14:52:29 -07:00
Svet Ganov
50a8bf4da0 Grant default permissions to the setup app robustly.
There is a zoo of components that handle the home intent and
have different priority. There is no reliable way to distinguish
the setup app from the other apps that handle home as some of
them have lower priority than the setup app and some higher.
This change adds a dedicated category to recognize the default
setup app.

Uncommented the code that grants accounts permissions as the
get_accounts permission is now a runtime permission and can be
granted.

bug:22471024
bug:22501463

Change-Id: I41726751fa2567cbcd7d09c7acfa7615b8aba577
2015-07-15 14:46:23 -07:00
Jim Miller
c7b0435cc7 resolved conflicts for merge of 1d4247c4 to mnc-dr-dev
Change-Id: I057c529dcd5d48e0dcf256a9d096c5d8b815892a
2015-07-15 14:33:10 -07:00
Dianne Hackborn
16f3671620 Fix issue #22487155: Device unresponsive (deadlock in system_server)
Using my magic potion, Deadlock-B-Gone!

Change-Id: If5c0a2b18134dc95444f3782ab5aa475414b5839
2015-07-15 11:32:32 -07:00
Dianne Hackborn
280a64e793 Improve tracking of screen on reasons.
- New screen on app op to record the last time each app has
  caused the screen to be turned on.
- New battery stats event that tells us the reason the screen
  has been asked to turn on.
- Propagate out power manager API to specify the reason a caller
  is asking to have the screen turned on.

Note that currently the window flag to turn the screen on bypasses
much of this because it is being handled in the window manager by
just directly telling the power manager to turn the screen on.  To
make this better we need a new API where it can specify who it is
calling the API for.

Change-Id: I667e56cb1f80508d054da004db667efbcc22e971
2015-07-15 09:59:07 -07:00
Dianne Hackborn
01a1750c54 am 68989134: am b3a578f4: am 90f13b19: am aa7b1450: am 63461e61: Merge "Bump mms whitelist time up to 1 minute." into mnc-dev
* commit '689891349ceaa15e9bce3d04f006d09ef3d2d101':
  Bump mms whitelist time up to 1 minute.
2015-07-15 02:37:11 +00:00
Dianne Hackborn
e0d96ce96c am 808dd5cc: am 4753b5bc: am 4f73990a: am aa3694f2: am f1f8b9cc: Merge "Fix issue #21626564: MMS should be receivied while Dozing" into mnc-dev
* commit '808dd5cc8af3e26d12c1b5fe80663eb306cc0c20':
  Fix issue #21626564: MMS should be receivied while Dozing
2015-07-15 02:37:04 +00:00
Dianne Hackborn
689891349c am b3a578f4: am 90f13b19: am aa7b1450: am 63461e61: Merge "Bump mms whitelist time up to 1 minute." into mnc-dev
* commit 'b3a578f4addd9873ea27b7543bbf8b720a00c807':
  Bump mms whitelist time up to 1 minute.
2015-07-15 02:22:00 +00:00
Dianne Hackborn
808dd5cc8a am 4753b5bc: am 4f73990a: am aa3694f2: am f1f8b9cc: Merge "Fix issue #21626564: MMS should be receivied while Dozing" into mnc-dev
* commit '4753b5bcf4877e125a8e38d5bcd2ac46c1744429':
  Fix issue #21626564: MMS should be receivied while Dozing
2015-07-15 02:21:54 +00:00
Fyodor Kupolov
b5143ecfee am 1fa2a088: am 1281575c: am 41fac5e8: am 189f3136: am 98724126: Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev
* commit '1fa2a0888284ae00c905dce7a3003b995815467a':
  Added sendBroadcastMultiplePermissions method
2015-07-15 01:58:48 +00:00
Dianne Hackborn
aa7b14501a am 63461e61: Merge "Bump mms whitelist time up to 1 minute." into mnc-dev
* commit '63461e61b9aba2514fb39f87b8741b6db1f7e5d7':
  Bump mms whitelist time up to 1 minute.
2015-07-15 01:57:25 +00:00
Dianne Hackborn
aa3694f2b3 am f1f8b9cc: Merge "Fix issue #21626564: MMS should be receivied while Dozing" into mnc-dev
* commit 'f1f8b9cc3ff5774e695568e8f02b018c0fd02844':
  Fix issue #21626564: MMS should be receivied while Dozing
2015-07-15 01:57:21 +00:00
Dianne Hackborn
0b6134b511 Bump mms whitelist time up to 1 minute.
Change-Id: I09074c440430580fcfb2581275defe61c63c8ae8
2015-07-14 18:48:07 -07:00
Fyodor Kupolov
1fa2a08882 am 1281575c: am 41fac5e8: am 189f3136: am 98724126: Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev
* commit '1281575c257d52f256f4a08559611e6ec0b6190e':
  Added sendBroadcastMultiplePermissions method
2015-07-15 01:42:58 +00:00
Adam Lesinski
24f49e1f76 am ebe37936: am 6b456c12: am 772c7b82: am 903ebd15: am 56d82dd2: BatteryStats: Fix deadlock
* commit 'ebe3793608b3b79211bd4c9616b3a7e95d587496':
  BatteryStats: Fix deadlock
2015-07-15 01:36:26 +00:00
Dianne Hackborn
fd854ee58c Fix issue #21626564: MMS should be receivied while Dozing
We now place whoever is receiving the MMS on the temporary
whitelist while doing so, so they can get network access to
download it.

There was also an issue that needed to be fixed where we
were no longer updating the list of allowed uids while
dozing based on their proc states...  we now do that.

Also did a bit of optimization of the temp white list update
path do the network policy manager, instead of going through
a broadcast we now directly call in to the network policy
manager.  This also allows us to have a synchronous version
of updating the list, so we can know the app has network access
before we tell it to do anything.

Finally added battery stats events for things going on and off
the whitelist so we can diagnose the behavior there.

Change-Id: Ic7fe010af680034d9f8cb014bb135b2addef7455
2015-07-14 18:33:08 -07:00
Adam Lesinski
ebe3793608 am 6b456c12: am 772c7b82: am 903ebd15: am 56d82dd2: BatteryStats: Fix deadlock
* commit '6b456c123516098be269ce7f852a440fa76f9d66':
  BatteryStats: Fix deadlock
2015-07-15 01:22:20 +00:00