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

161141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Santos Cordon
14c9121e3c DO NOT MERGE Do not hide any call log entries when they are added. 
When a call log entry is added, and it's phone account does not match a
currently registered one, we set it to hidden.  This code was built for
the calllog restore case where call log entries would be hidden when
added if the original phone account wasn't also
present on the new device (where the restore is being performed).

We no longer do that so we're removing the code that sets any call log
entry to hidden.

-- Resubmitting since this change was lost to a merge conflict --

Change-Id: I1ef094d5a35063e8f89cd1ecb1e5a0b59361781c
 2015-03-31 17:02:17 -07:00
Vinit Deshpande
5d16c59af7 Merge "Don't log errors if the receive thread is stopped." into m-wireless-dev 2015-03-31 21:02:01 +00:00
Lorenzo Colitti
f5c17221d4 Don't log errors if the receive thread is stopped. 
Change-Id: I75ddc9b68f0a61a9a7a78026ed97a8a7c5109cc3
 2015-03-31 07:07:03 +09:00
Pavel Zhamaitsiak
271c9edc30 Merge "WiFi Calling: Show different operator name string in Data usage dialog." into lmp-mr1-wfc-dev 
automerge: 5fd843b

* commit '5fd843b33383266cfe5f79f7ba4c5134c104cda0':
  WiFi Calling: Show different operator name string in Data usage dialog.
 2015-03-30 16:21:17 +00:00
Bart Sears
998fb1975f am 4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev 
automerge: e6687a7

* commit 'e6687a756cf4f6def71d920f80bb5898c081c4e1':
  CEC: Explicitly turn on screen for remote control passthrough
 2015-03-30 16:20:48 +00:00
Pavel Zhamaitsiak
5fd843b333 Merge "WiFi Calling: Show different operator name string in Data usage dialog." into lmp-mr1-wfc-dev 2015-03-27 22:14:30 +00:00
Bart Sears
e6687a756c am 4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev 
* commit '4a26c391d08dfa6a3c189293f0fc163b817b1b49':
  CEC: Explicitly turn on screen for remote control passthrough
 2015-03-27 21:15:24 +00:00
Wei Wang
d91f19354d Add API for BLE_SCAN_ALWAYS_AVAILABLE feature. 
Change-Id: I83e966d4db076db367ded71bfb50c39e57568156
 2015-03-27 14:05:37 -07:00
Bart Sears
4a26c391d0 Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev 2015-03-27 20:48:38 +00:00
Pavel Zhamaitsiak
31697500a7 WiFi Calling: Show different operator name string in Data usage dialog. 
Bug: 19950657
Change-Id: I9999d58e78154ed2d6d824973c40011875de15ef
 2015-03-27 10:51:48 -07:00
Deepanshu Gupta
fbeeccc354 am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6. 
automerge: b3fea86

* commit 'b3fea8671843675db3c091bd4c7c2d4fa31f2917':
  Fix tests for Java 6.
 2015-03-27 05:25:10 +00:00
Christopher Tate
8b301dba07 am dbe0dd16: When scanning unbundled apps, only install the expected APK tree 
automerge: d291cd4

* commit 'd291cd4040dcaa26d0f5cff637b11011d55fe25b':
  When scanning unbundled apps, only install the expected APK tree
 2015-03-27 05:24:50 +00:00
Deepanshu Gupta
b3fea86718 am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6. 
* commit '4e6ae02a29dd432648a81f3803f3ccf712621d43':
  Fix tests for Java 6.
 2015-03-27 02:19:58 +00:00
Deepanshu Gupta
4e6ae02a29 am 17bb697b: am ec8df9af: Fix tests for Java 6. 
* commit '17bb697b3bce1b23137553829dd62e0e7c16b472':
  Fix tests for Java 6.
 2015-03-27 01:09:53 +00:00
Deepanshu Gupta
17bb697b3b am ec8df9af: Fix tests for Java 6. 
* commit 'ec8df9af2f35eb5be4df01d66b1add4a4e7546c7':
  Fix tests for Java 6.
 2015-03-27 01:02:58 +00:00
Christopher Tate
d291cd4040 am dbe0dd16: When scanning unbundled apps, only install the expected APK tree 
* commit 'dbe0dd160e93feef1335830a36e86ae83b19b793':
  When scanning unbundled apps, only install the expected APK tree
 2015-03-27 00:32:25 +00:00
Christopher Tate
dbe0dd160e When scanning unbundled apps, only install the expected APK tree 
We now make sure, when scanning post-factory app installs, that we do not
accidentally activate a "leaked" or otherwise superfluous APK tree that the
scan algorithm happens to encounter before the one that we expect a priori
based on the persisted package-installation state.  When we find such an
extraneous installation we ignore it in favor of the expected one, similarly
to the policy used when collecting system-bundled packages that have been
updated.

Even if we find an unexpected APK for the package, if the expected one
turns out to be absent we fall back to the existing "we thought this app
was present and now it isn't" logic.

Bug 19602471

Change-Id: I141a93661946176c05d8cf52a123bdf75c8eef74
 2015-03-26 15:55:30 -07:00
Deepanshu Gupta
ec8df9af2f Fix tests for Java 6. 
- Change the guava version used to match the one included in the SDK.
   The test server uses the same. However, the command line build still
   uses the guava present at platform/external/guava, which is compiled
   with Java 7. Thus, running the tests from inside the IDE can be done
   via Java 6.
 - Rebuilt the test app classes with Java 6 compatibility.
 - Change similarity threshold to prevent differences due to some locale
   settings different java versions.

Change-Id: Ic71d43256a8cf6f9df296e63550667a202c7105f
 2015-03-26 12:29:36 -07:00
Michael Runge
f67c7bddc3 am 9a91bf1d: am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA 
automerge: 26eaaee

* commit '26eaaeed3dcc0e9010057c7a1cbf177c998c368e':
  Increase timeout when uncrypting OTA
 2015-03-26 06:22:03 +00:00
Michael Runge
26eaaeed3d am 9a91bf1d: am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA 
* commit '9a91bf1d18d3855b4bdaaa613fa10372da6e530e':
  Increase timeout when uncrypting OTA
 2015-03-26 04:16:29 +00:00
Michael Runge
9a91bf1d18 am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA 
* commit '96f47f5bf3f498a7a85721de2e265d8fa3e9af26':
  Increase timeout when uncrypting OTA
 2015-03-26 04:08:24 +00:00
Michael Runge
96f47f5bf3 am b0197033: Increase timeout when uncrypting OTA 
* commit 'b019703395ae0304ddd10054843c64db87229d23':
  Increase timeout when uncrypting OTA
 2015-03-26 03:57:33 +00:00
Etan Cohen
8a3c6ffcf6 Merge "Stop output of call number to logs" into lmp-mr1-wfc-dev 
automerge: 817d718

* commit '817d718d33256c15422d889bd93fb5453ad836a1':
  Stop output of call number to logs
 2015-03-26 03:16:54 +00:00
Michael Runge
b019703395 Increase timeout when uncrypting OTA 
Larger OTAs (750 MB tested) are taking 3-4 minutes
to write, due to the O_SYNC needed to ensure that
the data is actually committed to disk prior to
reboot.

Bug: 18750317
Change-Id: Idfab3ffd0276df4548f69a09c72ad6f4a344b6e6
(cherry picked from commit 01c06dfb076b71cb72c4bff9175bec9d59d2efde)
 2015-03-26 03:01:02 +00:00
Etan Cohen
817d718d33 Merge "Stop output of call number to logs" into lmp-mr1-wfc-dev 2015-03-26 02:58:55 +00:00
Jinsuk Kim
bd3deee37b CEC: Explicitly turn on screen for remote control passthrough 
Ensures that the playback device turns on display output signal
upon receiving CEC command <User Control Pressed>.

Bug: 19518981
Change-Id: I4f898380c9ffc071da2357a51e61309ae5d233f5
(cherry picked from commit 9b8507c52ae845c8eed9fd9952bf66538934b8fd)
 2015-03-26 02:01:11 +00:00
Shriram Ganesh
ee763b3562 Stop output of call number to logs 
Bug: 19602904
Change-Id: Ieb6ae8d5ab27571d1f6cf91c530713f22b21b513
 2015-03-25 18:23:56 -07:00
Pavel Zhamaitsiak
cf9f5a16fb Merge "IMS: UT ServiceClass" into lmp-mr1-wfc-dev 
automerge: d3b6cbe

* commit 'd3b6cbe172f429038894b1fae09fb72e8a646519':
  IMS: UT ServiceClass
 2015-03-25 23:04:21 +00:00
Pavel Zhamaitsiak
d3b6cbe172 Merge "IMS: UT ServiceClass" into lmp-mr1-wfc-dev 2015-03-25 22:52:37 +00:00
Vinit Deshpande
6a037241d5 Merge "EAP-AKA' : Add support of EAP-AKA' in WiFi Enterprise methods" into m-wireless-dev 2015-03-25 22:44:59 +00:00
Jean-Michel Bachot
adf9e95ecc EAP-AKA' : Add support of EAP-AKA' in WiFi Enterprise methods 
EAP-AKA' is a new hidden method

Change-Id: Ic103b25ad58807eebd5e0f8eefe3bfc02397aedc
Signed-off-by: Jean-Michel Bachot <jean-michel.bachot@intel.com>
Signed-off-by: Abdelmajid MLAYEH <abdelmajidx.mlayeh@intel.com>
 2015-03-25 15:38:28 -07:00
Amith Yamasani
b0f091fa9d am 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev 
automerge: ce3153d

* commit 'ce3153df56e4ed984b949869dd0ec97793f2c428':
  Fix NPE if FPE service does not exist.
 2015-03-25 22:31:56 +00:00
Amith Yamasani
ce3153df56 am 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev 
* commit '0afd1905b59446fc471680325bcbea802bb37c5c':
  Fix NPE if FPE service does not exist.
 2015-03-25 22:19:40 +00:00
Amith Yamasani
0afd1905b5 Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev 2015-03-25 22:12:46 +00:00
Omkar Kolangade
faf7ce03c2 IMS: UT ServiceClass 
When CF and CW MMI request will be triggered,
user preferred serviceclass will be sent to
the lower layers.

Change-Id: I230c59ec1ab0832e24755d5ba497b2b5e0749ec1
 2015-03-25 12:25:29 -07:00
Paul Crowley
a23995c233 Fix NPE if FPE service does not exist. 
Bug: 19846662
Change-Id: I44e014c66a524b282cce0cfc9b7513fc0f553576
 2015-03-25 11:43:42 +00:00
Pierre Vandwalle
e5334732bc Merge "add wifi config for power calculation" into m-wireless-dev 2015-03-25 02:43:54 +00:00
Pierre Vandwalle
ddfd35dbf9 add wifi config for power calculation 
Change-Id: Ic312ffeb299d199547cc75bc6977140f8e6e5f7b
 2015-03-24 19:30:02 -07:00
Deepanshu Gupta
c3902347f5 am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
automerge: 56789fd

* commit '56789fdb1a90075845c96536658ba501415b9633':
  Update JRE for runConfigurations.
 2015-03-25 00:21:27 +00:00
Deepanshu Gupta
8c20aacfb4 am dbb38b30: (-s ours) am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 
automerge: 5906563  -s ours

* commit '590656314faa267aba787102fd7c673e25710039':
  Fix project settings. [DO NOT MERGE]
 2015-03-25 00:21:20 +00:00
Deepanshu Gupta
0393f4d066 am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
automerge: 92d46e5

* commit '92d46e594b11cd9abec541bfb5c59267b5e9c540':
  Fix RoundRect radius.
 2015-03-25 00:21:11 +00:00
Deepanshu Gupta
ae24a4e920 am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev 
automerge: 5f77229

* commit '5f7722991ec80a4f93083cef6525ccc75221a9d0':
  Use right colors for status bar and nav bar.
 2015-03-25 00:21:04 +00:00
Deepanshu Gupta
e1e8c5ee85 am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev 
automerge: 43091cb

* commit '43091cbd204c7b563df5d9771e36a429c5e78c5f':
  Better shadows.
 2015-03-25 00:20:56 +00:00
Deepanshu Gupta
abd4ce3a24 am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev 
automerge: 360ac6f

* commit '360ac6f5610598eb6a841f285a3c42dc72198475':
  Fix layoutlib tests.
 2015-03-25 00:20:48 +00:00
Deepanshu Gupta
56789fdb1a am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit '862f5900e8abce1cc20979a4dca76e1f0b982880':
  Update JRE for runConfigurations.
 2015-03-25 00:08:31 +00:00
Deepanshu Gupta
590656314f am dbb38b30: (-s ours) am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 
* commit 'dbb38b30612dc054ba3bf066f8528cccfceb47ad':
  Fix project settings. [DO NOT MERGE]
 2015-03-25 00:08:28 +00:00
Deepanshu Gupta
92d46e594b am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
* commit 'e97079d97a5c914d06c24cb9deda1da9bea88aeb':
  Fix RoundRect radius.
 2015-03-25 00:08:23 +00:00
Deepanshu Gupta
5f7722991e am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev 
* commit '2b98abde26aa2033562b48d635d6f2ba11c48908':
  Use right colors for status bar and nav bar.
 2015-03-25 00:08:09 +00:00
Deepanshu Gupta
43091cbd20 am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev 
* commit '6fa9d5546fa27665de3f64564897a77735b2a1b0':
  Better shadows.
 2015-03-25 00:08:05 +00:00
Deepanshu Gupta
360ac6f561 am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev 
* commit '5bc625d83d60fbb27ab2297051971be91fb3e415':
  Fix layoutlib tests.
 2015-03-25 00:08:01 +00:00