Fyodor Kupolov
eeca6584cf
Make AccountManagerServiceTest work again
...
It was broken for quite a while. Introduced the following changes:
- Use mockito to mock AppOpsManager and UserManager
- Use MockContext directly and override what is necessary.
RenamingDelegatingContext doesn't work with absolute file names for
database paths, which is the case for system server DBs.
Bug: 26279712
Change-Id: I9f2a3892f9bd7a882d78f0bb7beb8669f7dc8c6f
2016-04-11 15:33:45 -07:00
Jeff Sharkey
03c7b09a83
Merge "Use callerPackage instead of callerApp." into nyc-dev
2016-04-11 22:33:43 +00:00
Yohei Yukawa
9dd39f8bcc
Merge "Shift+Meta+Space should reverse-rotate subtypes part 2." into nyc-dev
2016-04-11 22:33:25 +00:00
Todd Kennedy
3bdb89bd1c
DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours am: c2cc804 -s ours am: 620a4ed am: be58fe0
...
am: e265f35
2016-04-11 22:32:47 +00:00
Todd Kennedy
f4753cd263
DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c am: 6e0aff3 am: a73fa08 -s ours am: d73c865 am: e0481f0
...
am: e5116c2
2016-04-11 22:32:43 +00:00
Philip P. Moltmann
75b230b1d5
If a Disk goes away, remove the notifications that asks the user to format it.
...
Fixes: 22091912
Change-Id: I78448427c5d2f02d61251e4d697931d0d4e5c517
2016-04-11 15:28:05 -07:00
Todd Kennedy
e265f35caa
DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours am: c2cc804 -s ours am: 620a4ed
...
am: be58fe0
2016-04-11 22:27:50 +00:00
Todd Kennedy
e5116c2910
DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c am: 6e0aff3 am: a73fa08 -s ours am: d73c865
...
am: e0481f0
2016-04-11 22:27:46 +00:00
Craig Donner
0568f28ac3
Sets COARSE_LOCATION permission for VrCore when in vr mode.
...
See b/27900412 for more details.
Bug: 27900412
Change-Id: I3e8544e44ff6dfc96d58f9189cf0034ce76ed009
2016-04-11 15:27:02 -07:00
Kevin Hufnagle
09fab6dcb0
Merge "docs: Fixed capitalization error in method name." into mnc-mr-docs
2016-04-11 22:23:25 +00:00
Todd Kennedy
be58fe035e
DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours am: c2cc804 -s ours
...
am: 620a4ed
2016-04-11 22:22:35 +00:00
Todd Kennedy
e0481f0ee6
DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c am: 6e0aff3 am: a73fa08 -s ours
...
am: d73c865
2016-04-11 22:22:30 +00:00
Kevin Hufnagle
c501688ce5
Merge "docs: Updated link, wording associated with data-sharing IPC." into mnc-mr-docs
2016-04-11 22:22:18 +00:00
Jeff Sharkey
9323df6e46
Use callerPackage instead of callerApp.
...
When AlarmManager sends a broadcast, it only knows the packageName
that requested the broadcast, and the callerApp may not even be
running anymore. Since we only need the package name for enforcement,
use that instead of the possibly null callerApp.
Bug: 27397019
Change-Id: I8a52d73b4a83eebf85aa1adbfe06bd8886814d4b
2016-04-11 16:20:27 -06:00
Kevin Hufnagle
e84d9cea4f
Merge "docs: Fixed "APK signature scheme v2" link in N API Overview." into mnc-mr-docs
2016-04-11 22:19:33 +00:00
Todd Kennedy
620a4ed031
DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours
...
am: c2cc804
2016-04-11 22:17:20 +00:00
Todd Kennedy
1e07bda8fb
DO NOT MERGE Fix intent filter priorities am: eeb970a am: cd24c4e am: bd770bc
...
am: 7b068fa
2016-04-11 22:17:19 +00:00
Todd Kennedy
d73c865385
DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c am: 6e0aff3
...
am: a73fa08
2016-04-11 22:17:19 +00:00
Todd Kennedy
c2cc804407
DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9
...
am: ca13384
2016-04-11 22:12:19 +00:00
Todd Kennedy
a73fa08457
DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c
...
am: 6e0aff3
2016-04-11 22:12:09 +00:00
Todd Kennedy
7b068fa903
DO NOT MERGE Fix intent filter priorities am: eeb970a am: cd24c4e
...
am: bd770bc
2016-04-11 22:12:05 +00:00
Mitchell Wills
d0989c986e
Update WifiScanningService class name to new location
...
Change-Id: I48515b872341ea482c9e6c37e87ebaafea571d61
2016-04-11 15:06:54 -07:00
Todd Kennedy
ca133845ef
DO NOT MERGE Fix intent filter priorities am: 60351d3
...
am: 3dfc6d9
2016-04-11 22:06:38 +00:00
Todd Kennedy
bd770bc97b
DO NOT MERGE Fix intent filter priorities am: eeb970a
...
am: cd24c4e
2016-04-11 22:06:35 +00:00
Todd Kennedy
6e0aff30cf
DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours
...
am: ebb136c
2016-04-11 22:06:35 +00:00
Jeff Sharkey
2b05239ac8
Merge "Abort PRE_BOOT dispatch when user is stopped." into nyc-dev
2016-04-11 22:06:14 +00:00
Jeff Sharkey
100bd9c24a
Abort PRE_BOOT dispatch when user is stopped.
...
If a user was started and then stopped in quick succession, we need
to stop dispatching PRE_BOOT broadcasts for that user.
Bug: 28032940
Change-Id: Ie9aedc2cd66a7a2cb2076e5004831cf8fe1afc4a
2016-04-11 16:00:56 -06:00
Todd Kennedy
ebb136cbda
DO NOT MERGE Fix intent filter priorities
...
am: d6174e7
2016-04-11 22:00:31 +00:00
Todd Kennedy
3dfc6d986f
DO NOT MERGE Fix intent filter priorities
...
am: 60351d3
2016-04-11 22:00:27 +00:00
Todd Kennedy
cd24c4ebc0
DO NOT MERGE Fix intent filter priorities
...
am: eeb970a
2016-04-11 22:00:26 +00:00
Marco Nelissen
59dcf6746b
Add javadoc
...
Bug: 27952005
Change-Id: Ia1b6b6a723c30979c7c7ad7c0b2c0e7e295f0831
2016-04-11 14:49:19 -07:00
Makoto Onuki
5ba0d3e3a3
ShortcutManager: First cut of CTS
...
Bug 27548047
Change-Id: Idd7a768ea4fee44c2cf6e3bd473cea9e67f5f7cd
2016-04-11 14:48:44 -07:00
Adarsh Fernando
a1b59e1287
Merge "Docs: Android Plugin DSL Ref 2.0.0 was just published. Added some useful links." into mnc-mr-docs
...
am: 80202c0
2016-04-11 21:45:29 +00:00
Chris Tate
766dc50eeb
Merge "Scale wallpaper crop to device-suitable size" into nyc-dev
2016-04-11 21:45:11 +00:00
Winson
d87e9a4857
Adding vibration after successful dock/undock gesture.
...
Bug: 27588627
Change-Id: I1dd149d4f7e7fccf8ec61b59bab7c14a90b77e45
2016-04-11 21:39:00 +00:00
Dianne Hackborn
f260d2ef84
Merge "Fix issue #28118215 : Crash during system boot due to null carrier apps" into nyc-dev
2016-04-11 21:33:41 +00:00
Adarsh Fernando
80202c028b
Merge "Docs: Android Plugin DSL Ref 2.0.0 was just published. Added some useful links." into mnc-mr-docs
2016-04-11 21:33:33 +00:00
Robert Greenwalt
6e1e880f00
Merge "Add settings for SUW data control." into nyc-dev
2016-04-11 21:28:01 +00:00
Adam Powell
eba13dd07f
Prevent duplicate loader onLoadFinished calls on config change
...
Loaders report entering the started state in two places, once from
their host callbacks and once when moving into their host fragment's
starting state. In the former, we will also deliver load results if
we're finishing a retained cycle.
In practice, the individual fragment start happens first which clears
the report-next-start flag, then the finishRetain step sees that flag
is cleared and dispatches the finished load results again. Change
reportStart to only call onLoadFinished if we are not finishing up a
retain step.
Bug 28074512
Change-Id: I85b848f7d7b239c8fac5aec8f0c91e4eea6bcebf
2016-04-11 14:26:58 -07:00
Greg Kaiser
7c0393abdf
Merge "NanoApp: Make indentation consistent" into nyc-dev
2016-04-11 21:21:37 +00:00
Chris Craik
b38cb04952
Merge "Apply clip at reorder barriers to shadows" into nyc-dev
2016-04-11 21:17:39 +00:00
Chris Thornton
d043bbb22b
Merge "Updates to sound trigger test app." into nyc-dev
2016-04-11 21:14:33 +00:00
Kevin Hufnagle
a6a568d2ea
docs: Fixed "APK signature scheme v2" link in N API Overview.
...
The link in the TOC of the "Android N for Developers" page now
navigates readers to "APK signature scheme v2" properly.
Bug: 28041151
Change-Id: Idb143fd740395802c506b7c092976b49c6739ecc
2016-04-11 14:11:45 -07:00
Jack Yu
360dc21585
Moved ERI configuration files from resoures to Carrier Config.
...
Used Carrier Config to load correct ERI configuration file since
there are MCC/MNC shared by different carriers.
bug: 23887558
Change-Id: I61632045486929a5f0f1266fcf3b772a969d5836
2016-04-11 13:58:56 -07:00
John Reck
825fa4d5ae
Merge "Revert "Make stopped state a first-class thing"" into nyc-dev
2016-04-11 20:54:36 +00:00
Kevin Hufnagle
f04a421bf1
docs: Fixed "known issues" link.
...
The link to "known issues" (within the "Support resources" section
on the "Program Overview" page) now directs readers to the list of
known issues.
Bug: 28115106
Change-Id: I2b7c351dd048d188f47f02ed6bb750371a24fe89
2016-04-11 13:53:54 -07:00
John Reck
eab3f2658a
Revert "Make stopped state a first-class thing"
...
This reverts commit 945961f78a
2016-04-11 20:49:28 +00:00
Jeff Sharkey
cf0cc881eb
Merge "Rate-limit how often we collect wtf() logs." into nyc-dev
2016-04-11 20:48:16 +00:00
Steve McKay
eb76763b80
Merge "Don't enable new folder in downloads..." into nyc-dev
2016-04-11 20:41:30 +00:00
Jeff Sharkey
5cbcb52b96
Rate-limit how often we collect wtf() logs.
...
We've seen that aggressive Log.wtf() calls can DoS the system
process, since we fork and collect recent logcat output for each
call. After this CL, we rate-limit to only perform this heavy
lifting 5 times during any given 10 second window of time.
We still log the wtf() message to the binary event log.
Bug: 28117774, 28052546, 27994717, 27381069
Change-Id: Ic91b23fe7ee26818083a8d40fd4850fcb9d93643
2016-04-11 14:40:34 -06:00
