Christopher Tate
bf5d13c19b
Merge "Ensure the system boots with a halfway sane time/date" into oc-dev
...
am: 45fe7eef89
2017-04-11 01:19:34 +00:00
Fyodor Kupolov
101a03b58c
Merge "Cache mEphemeralAppsDisabled state" into oc-dev
...
am: aedca2e55d
2017-04-11 01:09:00 +00:00
TreeHugger Robot
45fe7eef89
Merge "Ensure the system boots with a halfway sane time/date" into oc-dev
2017-04-11 01:05:43 +00:00
TreeHugger Robot
aedca2e55d
Merge "Cache mEphemeralAppsDisabled state" into oc-dev
2017-04-11 00:43:39 +00:00
Adam Lesinski
475752ad50
Merge "OverlayManagerService: Make broadcasts/updates explicit" into oc-dev
...
am: ec8f353668
2017-04-11 00:13:41 +00:00
Adam Lesinski
ec8f353668
Merge "OverlayManagerService: Make broadcasts/updates explicit" into oc-dev
2017-04-11 00:04:41 +00:00
Chad Brubaker
8a9db875c9
Merge "Fix READ_PHONE_NUMBERS label" into oc-dev
...
am: 04088837b5
2017-04-10 23:58:31 +00:00
Bookatz
3c820a12f1
Merge "Fix double-detach DualTimer bug" into oc-dev
...
am: 754c46db37
2017-04-10 23:53:08 +00:00
Chad Brubaker
04088837b5
Merge "Fix READ_PHONE_NUMBERS label" into oc-dev
2017-04-10 23:34:21 +00:00
TreeHugger Robot
754c46db37
Merge "Fix double-detach DualTimer bug" into oc-dev
2017-04-10 23:33:45 +00:00
Android Build Merger (Role)
74568130ce
Merge "Merge "Deprecate TelephonyManager.getCellLocation()" am: bc0f610b25 am: a51173943a am: 599a4c7326" into oc-dev-plus-aosp
2017-04-10 23:31:51 +00:00
nharold
f72fd56b06
Merge "Deprecate TelephonyManager.getCellLocation()" am: bc0f610b25 am: a51173943a
...
am: 599a4c7326
2017-04-10 23:31:06 +00:00
Adam Lesinski
c9b051fc18
Merge "AAPT2: Share split functionality between link and optimize" into oc-dev
...
am: 3750fd24c6
2017-04-10 23:28:58 +00:00
Daniel Nishi
fcf746b27c
Merge "Fix crash when measuring storage." into oc-dev
...
am: a6bd937c93
2017-04-10 23:27:51 +00:00
TreeHugger Robot
3750fd24c6
Merge "AAPT2: Share split functionality between link and optimize" into oc-dev
2017-04-10 23:22:47 +00:00
nharold
599a4c7326
Merge "Deprecate TelephonyManager.getCellLocation()" am: bc0f610b25
...
am: a51173943a
2017-04-10 23:20:35 +00:00
Jack He
b111c6f753
Merge "Add developer setting and system API for inband ringing support" am: 1da38b2bcd am: d86c1fca76
...
am: 25c086b7e2
2017-04-10 23:20:08 +00:00
Daniel Nishi
a6bd937c93
Merge "Fix crash when measuring storage." into oc-dev
2017-04-10 23:12:21 +00:00
Jack He
25c086b7e2
Merge "Add developer setting and system API for inband ringing support" am: 1da38b2bcd
...
am: d86c1fca76
2017-04-10 23:11:15 +00:00
nharold
a51173943a
Merge "Deprecate TelephonyManager.getCellLocation()"
...
am: bc0f610b25
2017-04-10 23:10:01 +00:00
Jack He
d86c1fca76
Merge "Add developer setting and system API for inband ringing support"
...
am: 1da38b2bcd
2017-04-10 22:59:56 +00:00
nharold
bc0f610b25
Merge "Deprecate TelephonyManager.getCellLocation()"
2017-04-10 22:50:01 +00:00
Jack He
1da38b2bcd
Merge "Add developer setting and system API for inband ringing support"
2017-04-10 22:47:56 +00:00
Tyler Gunn
1c80ac52fe
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API." am: c4ea961f91 am: 1fb1c39838
...
am: b428268052
2017-04-10 22:18:01 +00:00
Tyler Gunn
b428268052
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API." am: c4ea961f91
...
am: 1fb1c39838
2017-04-10 22:08:12 +00:00
Tyler Gunn
1fb1c39838
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API."
...
am: c4ea961f91
2017-04-10 21:58:08 +00:00
Treehugger Robot
c4ea961f91
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API."
2017-04-10 21:49:06 +00:00
Bookatz
4a3eda992b
Fix double-detach DualTimer bug
...
DualTimer attempted to detach its subTimer twice when reset(true) was
called, once explicitly and once via a call to the main timer. This
fixes that problem by getting rid of the explicit detach in reset.
Bug: 37208694
Test: runtest -x
frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
and manually looked for "Removed unknown observer" error in logcat.
Change-Id: Ic5ff7d799d46236a74ab0825e108bef40bac0360
2017-04-10 14:28:00 -07:00
Todd Kennedy
41d82e619f
Merge "send broadcast to the right users" into oc-dev
...
am: 4a30689414
2017-04-10 20:33:48 +00:00
Wale Ogunwale
aba6084239
Merge "Do not set outActivity if value is null." into oc-dev
...
am: a09111e745
2017-04-10 20:32:17 +00:00
Tyler Gunn
b6ce026fd1
Add getSelfManagedPhoneAccounts() TelecomManager API.
...
This is consistent with the existing getCallCapablePhoneAccounts API
which is used to get the phone accounts capable of placing phone calls.
Test: CTS
Bug: 34159263
Merged-In: I1396c63a6882947cd66721528e53b6964a9091e0
Change-Id: I1396c63a6882947cd66721528e53b6964a9091e0
2017-04-10 13:29:21 -07:00
Todd Kennedy
4a30689414
Merge "send broadcast to the right users" into oc-dev
2017-04-10 20:10:17 +00:00
Wale Ogunwale
a09111e745
Merge "Do not set outActivity if value is null." into oc-dev
2017-04-10 20:04:10 +00:00
Fyodor Kupolov
433d68713f
Cache mEphemeralAppsDisabled state
...
Init mEphemeralAppsDisabled in systemReady when settings provider
is available.
Registered content observers for ENABLE_EPHEMERAL_FEATURE and
WEB_ACTION_ENABLED.
Test: manual triggering enable_ephemeral_feature=1/0
Fixes: 36869938
Fixes: 36895304
Change-Id: I0051c45bb209d86041b967a409f8a95967df21dc
2017-04-10 12:53:47 -07:00
Jack He
e86bdcaed1
Add developer setting and system API for inband ringing support
...
* Add 1 system API to check inband ringing flag in config.xml
static isInbandRingingSupported(Context)
* Add developer menu options to enable this feature
Bug: 19171297
Test: mm -j 40, HFP regression testing, testplans/82144
Change-Id: Iaf56ea41911f546bbc7ae1f82e399d0f8d48f75f
2017-04-10 19:49:36 +00:00
Christopher Tate
24757146d1
Ensure the system boots with a halfway sane time/date
...
Just in case the kernel or vendor glue don't initialize the system time
sensibly, we now make sure the current time at boot is at least up to the
build time of the system disk image.
Bug 36736983
Test: manual
Change-Id: I46f776300ca4f5ad01396fc17c83fc833e1713f9
2017-04-10 12:44:09 -07:00
Sudheer Shanka
1bbe822a5c
Merge "NetworkPolicyManagerService: fix deadlock" into oc-dev
...
am: 73edcd7328
2017-04-10 19:37:21 +00:00
Andrii Kulian
f44551b505
Merge "Fix activity move between displays" into oc-dev
...
am: c2ec7bf965
2017-04-10 19:35:28 +00:00
Sudheer Shanka
73edcd7328
Merge "NetworkPolicyManagerService: fix deadlock" into oc-dev
2017-04-10 19:28:31 +00:00
Jerry Zhang
f3c310e853
Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function" into oc-dev
...
am: 0015a15353
2017-04-10 19:26:47 +00:00
Andrii Kulian
c2ec7bf965
Merge "Fix activity move between displays" into oc-dev
2017-04-10 19:20:37 +00:00
Dmitry Dementyev
a7dd87ce2d
Merge "Make visible only accounts for which authenticator supports contacts operations for callers with READ_CONTACTS permission." into oc-dev
...
am: d401163599
2017-04-10 19:14:52 +00:00
Todd Kennedy
4efa14c784
send broadcast to the right users
...
Change-Id: Ibda2d922cd58d6ca1c1a4ecdccaa25e5c71c6320
Fixes: 37192695
Test: manual; create restricted profile and see that users haven't been removed
2017-04-10 12:12:11 -07:00
Adam Lesinski
d0f492db03
AAPT2: Share split functionality between link and optimize
...
Generating splits should be possible to do from the optimize command.
This means that a lot of infrastructure around split APKs can be
shared by both the optimize and link phase.
Bug: 35925830
Change-Id: Ia88b9e4bff300a56353b2f7a4a2547c8eb43a299
Test: manual
2017-04-10 11:59:18 -07:00
Jerry Zhang
0015a15353
Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function" into oc-dev
2017-04-10 18:52:00 +00:00
Dmitry Dementyev
d401163599
Merge "Make visible only accounts for which authenticator supports contacts operations for callers with READ_CONTACTS permission." into oc-dev
2017-04-10 18:30:53 +00:00
Bryce Lee
1d8b1afeaf
Do not set outActivity if value is null.
...
Recent changes passed down the nullable array to a method where it
was not being properly checked.
Change-Id: Ibf940f9225e4c9901869188aa55a04d0908015c3
Fixes: 37197666
Test: manual via bug repro steps.
2017-04-10 11:06:17 -07:00
Chad Brubaker
1d99079ef4
Fix READ_PHONE_NUMBERS label
...
Change-Id: If4a254092168d9f7b133a58b59dd946f64cefdae
Fixes:37207265
Test: builds
2017-04-10 10:48:35 -07:00
Selim Gurun
e7534f48ce
Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev
...
am: c922c4827a
2017-04-10 16:48:28 +00:00
TreeHugger Robot
c922c4827a
Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev
2017-04-10 16:36:48 +00:00
