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

280277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip P. Moltmann
a791fee2bc Merge "Increment vers of PrintRecommendationService" 
am: 08bff42ef4

Change-Id: Ie98d6f58dbb4d29e27200aa1b9829372930a0fa3
 2016-12-16 22:51:11 +00:00
Marie Janssen
ed50bbcffd Bluetooth: fix issues re-enabling after crash 
When Bluetooth crashes, sometimes an LE app restarts it before
ActivityManager gets a chance.  In this case, the Bluetooth manager
would assume the state should be LE only and did not continue to fully
enabled.

Luckily in this case the persisted system state is also ON.  Use the
persisted state as information about whether we should be fully enabled.

Test: basic sanity check, forced crash of BT
Bug: 33632976
Change-Id: I546d7abccb82a26fcca2eb70d6d7c76e9510404e
 2016-12-16 22:50:13 +00:00
Adrian Roos
ca504aae64 Merge "Assist app is not launched when long-pressing on Home key" into nyc-mr2-dev 
am: 31b96311bf

Change-Id: Id4bfb36551b47a733acb21ede4cc587840496b54
 2016-12-16 22:37:12 +00:00
Kaori Katou
ea00cbb776 Assist app is not launched when long-pressing on Home key 
am: ed7bf5eecc

Change-Id: I84d53841eaa9d2e28447a891ad58460fbf24b364
 2016-12-16 22:37:06 +00:00
Philip P. Moltmann
08bff42ef4 Merge "Increment vers of PrintRecommendationService" 2016-12-16 22:36:11 +00:00
Vitalii Tomkiv
d49df21f80 Merge changes Ic85892b4,I627e47c6 
am: d995c94426

Change-Id: If036b0f5b8497667a9c2a916ec74d482def2aed5
 2016-12-16 22:35:54 +00:00
Vitalii Tomkiv
7f797cc54c Make sure Zygote is running at process priority 0 after VM has started. 
am: 1e52ce48a6

Change-Id: Ia1f511d294a9c718534a4a0b8ad747ef58a98b52
 2016-12-16 22:35:49 +00:00
Junda Liu
b5ee93791a Merge "Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL." into nyc-mr2-dev 
am: 565fcb4b95

Change-Id: Ia58e19c82426d85b707bf98612f0b08bb1b4ecf2
 2016-12-16 22:35:19 +00:00
Junda Liu
0c62aa5f10 Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL. 
am: 6bb22e3de2

Change-Id: I8228c805c69189966b0b4f12d11ab7c5564766c4
 2016-12-16 22:35:13 +00:00
Todd Kjos
501875bbe8 Revert "Add boost to increase the load on newly-forked zygote processes." 
am: 8175f0955a

Change-Id: I6f61c45f690647c860e0ceb140857e53bc253f00
 2016-12-16 22:35:08 +00:00
Adrian Roos
31b96311bf Merge "Assist app is not launched when long-pressing on Home key" into nyc-mr2-dev 2016-12-16 22:32:34 +00:00
Junda Liu
565fcb4b95 Merge "Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL." into nyc-mr2-dev 2016-12-16 22:24:19 +00:00
Treehugger Robot
d995c94426 Merge changes Ic85892b4,I627e47c6 
* changes:
  Make sure Zygote is running at process priority 0 after VM has started.
  Revert "Add boost to increase the load on newly-forked zygote processes."
 2016-12-16 22:20:25 +00:00
Torne (Richard Coles)
4e6876662d Merge "Add the webview zygote socket to the zygote whitelist." am: f8882ae834 am: bc801c663e 
am: e19d6d414d

Change-Id: I3e8867f2ce74d03a304201b68f06bfd70853c2fa
 2016-12-16 21:52:40 +00:00
Torne (Richard Coles)
e19d6d414d Merge "Add the webview zygote socket to the zygote whitelist." am: f8882ae834 
am: bc801c663e

Change-Id: If1edf0bf30e8359912235c788a49131b528efb30
 2016-12-16 21:45:40 +00:00
Michael Kwan
67639a5f67 Fix OnCancelListener for Dialogs on swipe to dismiss. 
Swipe to dismiss on dialogs did not dispatch onCancel events
to OnCancelListeners. Resolve by adding listener to monitor
swipe to dismiss events and dispatch onCancel events when
that occurs.

Bug: 33663411
Change-Id: I64ff29e008d485a4559eb3d1ff7f0e74dccff404
 2016-12-16 13:43:16 -08:00
Torne (Richard Coles)
bc801c663e Merge "Add the webview zygote socket to the zygote whitelist." 
am: f8882ae834

Change-Id: I02d08d8f91567b8bd6709137f98f87550c13f145
 2016-12-16 21:38:17 +00:00
Treehugger Robot
f8882ae834 Merge "Add the webview zygote socket to the zygote whitelist." 2016-12-16 21:25:35 +00:00
Todd Kjos
bac0d87926 Merge changes I627e47c6,Ic85892b4 into nyc-mr1-dev-plus-aosp 
am: 85a19e86d0

Change-Id: I240a2ae5d97e275d3660a7a2d5e9f2e5e222e813
 2016-12-16 21:14:16 +00:00
Todd Kjos
aaa695809a Revert "Add boost to increase the load on newly-forked zygote processes." 
am: 80fb0b0a44

Change-Id: Iaec14c37eb4bdf685d47ff28d7caa652bb1057dc
 2016-12-16 21:14:13 +00:00
Vitalii Tomkiv
8b238abd30 Make sure Zygote is running at process priority 0 after VM has started. 
am: 5cbce85fd3

Change-Id: If47c73fe85b16337e2c60715edb1861e7ef244d3
 2016-12-16 21:13:35 +00:00
TreeHugger Robot
85a19e86d0 Merge changes I627e47c6,Ic85892b4 into nyc-mr1-dev-plus-aosp 
* changes:
  Revert "Add boost to increase the load on newly-forked zygote processes."
  Make sure Zygote is running at process priority 0 after VM has started.
 2016-12-16 21:03:00 +00:00
Philip P. Moltmann
c56da03d06 Increment vers of PrintRecommendationService 
as the Samsung PlugIn was updated.

Test: Let the service generate some recommendations
Change-Id: Ief7ea4f1dddfee92aa9fa83ff53b296ced0e3b55
 2016-12-16 12:52:53 -08:00
Joe LaPenna
6fcaf62ab7 Merge "Set com.android.networkrecommendation as the default network recommendation service." am: 0b4df21aac am: 4c3b2f5f99 
am: de89c74f51

Change-Id: Iac44d02fa3fc12ca3d375c60a98bad67d0dc21c9
 2016-12-16 20:51:56 +00:00
Joe LaPenna
de89c74f51 Merge "Set com.android.networkrecommendation as the default network recommendation service." am: 0b4df21aac 
am: 4c3b2f5f99

Change-Id: I7ee10f1336c48969fa64cd6f5a45087027a2e8c3
 2016-12-16 20:44:05 +00:00
Joe LaPenna
4c3b2f5f99 Merge "Set com.android.networkrecommendation as the default network recommendation service." 
am: 0b4df21aac

Change-Id: Ia955fd0d980a5ddcdb5ae6880c7a380251819f44
 2016-12-16 20:35:53 +00:00
Treehugger Robot
0b4df21aac Merge "Set com.android.networkrecommendation as the default network recommendation service." 2016-12-16 20:23:48 +00:00
Andreas Gampe
33e85b79d2 Merge changes Ia4bec085,I59095f2a am: 733d007279 am: 3d17e17b0a 
am: 2260a6ef9a

Change-Id: I5fd2ded2e619178487606fb6cae91401b92448d8
 2016-12-16 19:55:48 +00:00
Tamas Berghammer
f00963c71f Enable logwrapper functionality on user builds am: 0ca16fa584 am: db05d4b4ed 
am: ed8757a761

Change-Id: I0f27f6aeb58690addb1c5f7978047ccb8d73ab84
 2016-12-16 19:54:58 +00:00
Tamas Berghammer
b8d0e4d9fc Zygote: Add invoke-with to zygote protocol am: b8f7c351b9 am: 45c2fffc52 
am: d71bb300e6

Change-Id: Ied54640c44ade52abd6a905526ba7789be14a332
 2016-12-16 19:54:11 +00:00
Andreas Gampe
2260a6ef9a Merge changes Ia4bec085,I59095f2a am: 733d007279 
am: 3d17e17b0a

Change-Id: I835f1efcf985c73db9ddb5ffe15d80842afdf6e2
 2016-12-16 19:47:42 +00:00
Tamas Berghammer
ed8757a761 Enable logwrapper functionality on user builds am: 0ca16fa584 
am: db05d4b4ed

Change-Id: Ic6c3395f9965657a7f9abe580867eeb81b59ed88
 2016-12-16 19:46:55 +00:00
Tamas Berghammer
d71bb300e6 Zygote: Add invoke-with to zygote protocol am: b8f7c351b9 
am: 45c2fffc52

Change-Id: I90999d84c9694bfeebea8d2c2d95d1d545bac7e8
 2016-12-16 19:46:03 +00:00
Andreas Gampe
3d17e17b0a Merge changes Ia4bec085,I59095f2a 
am: 733d007279

Change-Id: Id0f0746af66b4f2e0352e2a0dde9d3f27e23f84c
 2016-12-16 19:38:43 +00:00
Tamas Berghammer
db05d4b4ed Enable logwrapper functionality on user builds 
am: 0ca16fa584

Change-Id: Ic18991f9a59f05356fcbcc65acc79be43fc68542
 2016-12-16 19:38:38 +00:00
Tamas Berghammer
45c2fffc52 Zygote: Add invoke-with to zygote protocol 
am: b8f7c351b9

Change-Id: I79db6f759b02ef612364fc857102615d51900cd9
 2016-12-16 19:37:57 +00:00
Todd Kjos
80fb0b0a44 Revert "Add boost to increase the load on newly-forked zygote processes." 
This reverts commit 6d43a861d01ef48f37c69f96346a13d23164a585.

(cherry picked from commit 0f2ded62ae3d88ddb732df182c3bfee3e2729018)

Test: m
Test: Device boots
Change-Id: I627e47c6ead4ce2d2bffa923a32a56d06c022df7
 2016-12-16 11:31:30 -08:00
Christine Franks
8ec23fe5b5 Merge "Add config_demoModePassword" into nyc-mr2-dev 
am: ee3af13cf2

Change-Id: I90badd6bc1069e015331c697bbde912465e918c1
 2016-12-16 19:31:22 +00:00
Adam Lesinski
45489787d7 Reset BatteryStats when too large for clients to handle 
When BatteryStats history is too large, the Settings app crashes.
Reset the battery stats by marking an *OVERFLOW* event at the
beginning of the newly reset history.

This seems to happen in Retail mode when the devices are on charger
for an extended period of time and accumulate a sufficiently large
history. Resetting makes sense because the phone is most likely
charged and will reset anyways when unplugged.
Bug: 32540341
Test: Manual

Change-Id: I8c2892458b5d9ce64b1c44aa2e2a000340e71e63
 2016-12-16 19:27:53 +00:00
Andreas Gampe
733d007279 Merge changes Ia4bec085,I59095f2a 
* changes:
  Enable logwrapper functionality on user builds
  Zygote: Add invoke-with to zygote protocol
 2016-12-16 19:24:13 +00:00
Marie Janssen
fa63068deb Bluetooth: fix issues re-enabling after crash 
When Bluetooth crashes, sometimes an LE app restarts it before
ActivityManager gets a chance.  In this case, the Bluetooth manager
would assume the state should be LE only and did not continue to fully
enabled.

Luckily in this case the persisted system state is also ON.  Use the
persisted state as information about whether we should be fully enabled.

Test: basic sanity check, forced crash of BT
Bug: 33632976
Change-Id: I546d7abccb82a26fcca2eb70d6d7c76e9510404e
 2016-12-16 11:23:30 -08:00
Marie Janssen
ffcf88f36e Bluetooth: log message improvements 
Some log improvements:
 - Reduce logspam
 - Use names for states in logs instead of numbers
 - Be more consistent with messages

Also remove some commented out dead code.

Test: run on phone, observe more useful logs
Change-Id: I32163278e148be144c03d4e8aaf0eb761226c94c
 2016-12-16 11:22:04 -08:00
Vitalii Tomkiv
5cbce85fd3 Make sure Zygote is running at process priority 0 after VM has started. 
Boosting up zygote priority before VM startup, saves ~450ms of boot time
for N9, 180ms for Nexus 5X.

(cherry picked from commit 5d551a5ac3d13706f62a86842ff6851e1d25213b)

Bug: 28866384
Test: m
Test: Device boots
Change-Id: Ic85892b408e15bbc1de7ce706f113f23974fe478
 2016-12-16 11:19:33 -08:00
Christine Franks
22ed8175ce Add config_demoModePassword 
am: 566525c6bb

Change-Id: Idc99f301b936be1f1a8a70b33f2ff02f396f9da0
 2016-12-16 19:17:33 +00:00
Christine Franks
ee3af13cf2 Merge "Add config_demoModePassword" into nyc-mr2-dev 2016-12-16 19:10:59 +00:00
Android Build Merger (Role)
0979227c6f Merge "Merge "FalsingLog: Fix false positive Log.wtfs" into nyc-mr2-dev am: 6ce17fb072" into nyc-mr2-dev-plus-aosp 2016-12-16 19:03:07 +00:00
Android Build Merger (Role)
c584b7191d Merge "FalsingLog: Fix false positive Log.wtfs am: 64f87bad12" into nyc-mr2-dev-plus-aosp 2016-12-16 19:02:48 +00:00
Adrian Roos
d980b03299 Merge "FalsingLog: Fix false positive Log.wtfs" into nyc-mr2-dev 
am: 6ce17fb072

Change-Id: Id22b291757e72e7aa2e56e1f2ed65f7dcb7b00b0
 2016-12-16 19:02:05 +00:00
Adrian Roos
5b5faea151 FalsingLog: Fix false positive Log.wtfs 
am: 64f87bad12

Change-Id: Ief66fe0f832737f733d728a8b0533bcabfc3c57c
 2016-12-16 19:01:58 +00:00
Andreas Gampe
49a25312b9 Merge "NativeLibraryHelper: Minor fixes" am: c1536f0d10 am: 109a82d7e3 
am: 77274269ba

Change-Id: Id450c7da8d22390c0e7506ed9058bdbf261d3ef4
 2016-12-16 19:01:52 +00:00