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

23108 Commits

Author SHA1 Message Date
Craig Mautner
9d82182f0c am 31ae1730: Merge "Add debug for ANR" into lmp-mr1-dev 
automerge: 0f6da47

* commit '0f6da477cbf3232996770a17910d3e44a0b893ac':
  Add debug for ANR
 2015-01-13 22:03:04 +00:00
Craig Mautner
0f6da477cb am 31ae1730: Merge "Add debug for ANR" into lmp-mr1-dev 
* commit '31ae17309e8c79c4b1a7b63a9c4bb43ae0849de2':
  Add debug for ANR
 2015-01-13 21:34:27 +00:00
Craig Mautner
bcb6eb9e26 Add debug for ANR 
Help for bug 17721767.

Change-Id: If863f3e6536be8af2c189dcc37d503c4d6b663b4
 2015-01-13 13:24:17 -08:00
Greg Hackmann
b5af40f040 am 96f7ac84: Merge "Find wall clock RTC through sysfs" automerge: 41ef80e 
* commit '96f7ac84b51c3ceb913e78275e99e2f4f79ebe86':
  Find wall clock RTC through sysfs
 2015-01-13 20:53:06 +00:00
Greg Hackmann
0eb5826830 Find wall clock RTC through sysfs 
Devices may have multiple RTCs.  By default the kernel uses rtc0 to
store the system time, but devices may override this (or even specify
that none of them should be used for system time).

Userspace can indirectly find the designated RTC through sysfs.  During
AlarmManagerService initialization, enumerate through all rtc class
devices to locate the device with attribute hctosys=1.

This is only done on devices without /dev/alarm, which has its own
in-kernel mechanism to pick the RTC.

Change-Id: Ife2b342c3590133ed316ddaf1799cbc1bfa6e6d9
Signed-off-by: Greg Hackmann <ghackmann@google.com>
 2015-01-13 12:16:56 -08:00
Wink Saville
948279954a am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 
* commit '6a903c31fede2fabdbcda7b5fe0cddcf467f1eb7':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 19:15:58 +00:00
Wink Saville
6a903c31fe am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 
* commit '84c5e8ebf0185ca65d4bab148f6d72d71940aba8':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 19:09:48 +00:00
Wink Saville
071743f0cb Rename reg/unreg OnSubscriptionsChangedListener. 
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
 2015-01-13 08:36:24 -08:00
Prashant Malani
0142097a03 am b71f9f96: Merge "Improve the circularMask for round displays" into lmp-mr1-dev 
automerge: 4212bf1

* commit '4212bf1fad7ab15b10926b30038aae380697aaa3':
  Improve the circularMask for round displays
 2015-01-12 18:42:48 +00:00
Prashant Malani
4212bf1fad am b71f9f96: Merge "Improve the circularMask for round displays" into lmp-mr1-dev 
* commit 'b71f9f96f7f464267c59a80add495388338ced04':
  Improve the circularMask for round displays
 2015-01-12 18:40:56 +00:00
Prashant Malani
b71f9f96f7 Merge "Improve the circularMask for round displays" into lmp-mr1-dev 2015-01-12 18:34:46 +00:00
Olawale Ogunwale
0f8ecc84c8 am 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG receiver finished" 
* commit '9d293911221cac930eb8edfef01362ea083eeaab':
  [ActivityManager] Distinguish FG or BG receiver finished
 2015-01-12 16:44:28 +00:00
Olawale Ogunwale
d362d19364 am cacf5564: am e3f85985: Merge "bindService can\'t start up service process" 
* commit 'cacf55647f64076f840f37537a5edb979fe2c3ab':
  bindService can't start up service process
 2015-01-12 16:44:22 +00:00
Olawale Ogunwale
d07b9ea63d am a9ae5050: am 8ddd5f4c: Merge "[ActivityManager] Fix process record leakage." 
* commit 'a9ae505053585b6c46a6a86475959fd9fe501b09':
  [ActivityManager] Fix process record leakage.
 2015-01-12 16:44:12 +00:00
Olawale Ogunwale
ebdfb6e864 Merge "[ActivityManager] Distinguish FG or BG receiver finished" 2015-01-12 13:45:13 +00:00
Olawale Ogunwale
e3f8598547 Merge "bindService can't start up service process" 2015-01-12 13:44:35 +00:00
Olawale Ogunwale
8ddd5f4cd6 Merge "[ActivityManager] Fix process record leakage." 2015-01-12 13:44:17 +00:00
Jinsuk Kim
c7325cd357 am f94d5d26: Merge "CEC: Keep Playback device awake while it is the active source" into lmp-mr1-dev 
automerge: 258b941

* commit '258b9418905de33f1b6f8461d79c8e39be7a50a5':
  CEC: Keep Playback device awake while it is the active source
 2015-01-10 22:07:03 +00:00
Jinsuk Kim
258b941890 am f94d5d26: Merge "CEC: Keep Playback device awake while it is the active source" into lmp-mr1-dev 
* commit 'f94d5d26f2d122cbb41327d8e34d8655514f9b0c':
  CEC: Keep Playback device awake while it is the active source
 2015-01-10 22:04:27 +00:00
Jinsuk Kim
f94d5d26f2 Merge "CEC: Keep Playback device awake while it is the active source" into lmp-mr1-dev 2015-01-10 21:59:40 +00:00
Paul Jensen
2a41b76186 am 60944390: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev 
automerge: 63e2b8e

* commit '63e2b8e058f379582d0325aa84b5de6bfa73e15b':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.
 2015-01-10 02:08:59 +00:00
Paul Jensen
63e2b8e058 am 60944390: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev 
* commit '60944390cde10c44064f1eda67eae5d76598f0d8':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.
 2015-01-10 02:06:06 +00:00
Paul Jensen
60944390cd Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev 2015-01-10 01:59:45 +00:00
Dianne Hackborn
2abf1f1c21 Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev automerge: 54f9b1e 
automerge: a319aa8

* commit 'a319aa800df36d40e1de453b64fd1e14573e6d80':
  Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
 2015-01-09 19:13:58 +00:00
Dianne Hackborn
a319aa800d Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev 
automerge: 54f9b1e

* commit '54f9b1eedc86a3066bedf3d8ea3e8ffbb83cb678':
  Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
 2015-01-09 19:11:44 +00:00
Dianne Hackborn
54f9b1eedc Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev 2015-01-09 19:08:50 +00:00
Prashant Malani
ea481beda6 Improve the circularMask for round displays 
The mask was earlier drawn as a thin ring at the display periphery.
This had undesirable effects when screenshots were taken, as the ring
was seen, as well as display content beyond it.

This patch modifies the mask to be a black canvas with portions erased
to improve the screenshot image.

Bug: 18772987
Change-Id: I25ef6387879613354308e015446fe325ed8c4515
 2015-01-09 11:07:03 -08:00
Ariel Gertzenstein
4a207e3e52 Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524" into lmp-mr1-dev automerge: cce8db2 
automerge: b32831e

* commit 'b32831eebfd3c3ba2b26da18fef6818c12643f9d':
  Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524
 2015-01-09 18:03:03 +00:00
Ariel Gertzenstein
b32831eebf Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524" into lmp-mr1-dev 
automerge: cce8db2

* commit 'cce8db2c31a03d0c4e04f5851415d37032ae6621':
  Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524
 2015-01-09 17:59:15 +00:00
Ariel Gertzenstein
cce8db2c31 Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524" into lmp-mr1-dev 2015-01-09 17:56:11 +00:00
Dianne Hackborn
b3d4cb369e Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi 
FastPrintWriter needs to have its own lock for each instance, or
else one getting blocked can cause others to block and whacky deadlocks
result.

Also:

- Improve error reporting of SystemConfig to tell you which config
  file is the problem.
- Fix CoreSettingsProvider to not spew errors if a setting is not
  defined (it should just use a default value).
- Get rid of noisy init output of ConditionProviders.
- Reduce log noise of starting a process; move some of that information
  to ProcessRecord to print on demand.

Change-Id: I1032d141ddd449968b74ab7b88ab36f2d228ad1a
 2015-01-09 09:54:06 -08:00
Ariel Gertzenstein
2999acb0ce Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524 
This reverts commit bde7bc45af2bb7f9bee8096d45973f25cc00c5db.

Change-Id: I1a0bcd1c2e0d4ade7efa980edd2105408bb48991
 2015-01-09 17:45:40 +00:00
Robin Lee
e24637e641 am 7f7ea82c: Profile owner hint in warning for extra CAs 
automerge: 34f3ade

* commit '34f3adedcc20b365361f40131347179152377954':
  Profile owner hint in warning for extra CAs
 2015-01-09 15:13:52 +00:00
Robin Lee
34f3adedcc am 7f7ea82c: Profile owner hint in warning for extra CAs 
* commit '7f7ea82c28f01798b15686aa45733885beebcc6e':
  Profile owner hint in warning for extra CAs
 2015-01-09 15:12:24 +00:00
Robin Lee
7f7ea82c28 Profile owner hint in warning for extra CAs 
The version of the warning with a named installer should be shown in
the case of a managed profile, not only a managed device.

Bug: 18224038
Change-Id: I27865f77e963b9b15416f2e4a4ffc38fed8f5532
 2015-01-09 11:25:04 +00:00
Jinsuk Kim
e26d833c4a CEC: Keep Playback device awake while it is the active source 
Alleviates the user experience issue of having to turn on the device
manually when it goes to standby mode while the device occupies
the display.

Bug: 18882764
Change-Id: I10b239a599a310e47e3c2cb98737e4b0fdb4e435
 2015-01-09 15:07:39 +09:00
Shishir Agrawal
f53dda1c54 am bde7bc45: GpsLocationProvider: Read data enabled status from TelephonyManager. 
automerge: 2db7977

* commit '2db79771b6a92d9db6b670b000990d6a3398364d':
  GpsLocationProvider: Read data enabled status from TelephonyManager.
 2015-01-09 01:39:02 +00:00
Shishir Agrawal
2db79771b6 am bde7bc45: GpsLocationProvider: Read data enabled status from TelephonyManager. 
* commit 'bde7bc45af2bb7f9bee8096d45973f25cc00c5db':
  GpsLocationProvider: Read data enabled status from TelephonyManager.
 2015-01-09 01:35:16 +00:00
Shishir Agrawal
bde7bc45af GpsLocationProvider: Read data enabled status from TelephonyManager. 
Bug: 18814559
Change-Id: Ie8edde652565aca2e2a1935ed42eb927b7d26baa
 2015-01-08 16:04:24 -08:00
Robin Lee
a92da1c21a am 2cc617b2: Merge "Revert "Profile owner hint in warning for extra CAs"" into lmp-mr1-dev 
automerge: bc7efed

* commit 'bc7efed6941ddc63b399818608a4ec117b74af5f':
  Revert "Profile owner hint in warning for extra CAs"
 2015-01-08 22:39:39 +00:00
Robin Lee
bc7efed694 am 2cc617b2: Merge "Revert "Profile owner hint in warning for extra CAs"" into lmp-mr1-dev 
* commit '2cc617b2adcd3c54837a251b688e909e3224a5e4':
  Revert "Profile owner hint in warning for extra CAs"
 2015-01-08 22:38:22 +00:00
Robin Lee
2cc617b2ad Merge "Revert "Profile owner hint in warning for extra CAs"" into lmp-mr1-dev 2015-01-08 22:31:36 +00:00
Robin Lee
e53b7dd066 Revert "Profile owner hint in warning for extra CAs" 
This reverts commit e1d8dcd9e170c1ed8a13b6e1256ea1fb22c26c49.

Something funny happened in the process of submitting this,
swathes of strings.xml became mis-encoded.

Bug: 18224038
Change-Id: I0276ff3f880fe749546e8cc7e3e2f41c22c27705
 2015-01-08 22:08:42 +00:00
Dianne Hackborn
3968820fc7 am cb8d8e10: Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev 
automerge: 16e4324

* commit '16e4324dd967d180f77fb25dbeea77229eaf0511':
  Fix issue #18827122: system server crashed on broadcasting...
 2015-01-08 21:48:34 +00:00
Dianne Hackborn
16e4324dd9 am cb8d8e10: Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev 
* commit 'cb8d8e10b0c1163914aca85f8e3b73a0cac86fb4':
  Fix issue #18827122: system server crashed on broadcasting...
 2015-01-08 21:46:53 +00:00
Dianne Hackborn
cb8d8e10b0 Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev 2015-01-08 21:41:35 +00:00
Craig Mautner
0e2fdb4312 Merge "Remove AppWindowTokens from exiting apps with task" into lmp-mr1-dev automerge: 62a32ee 
automerge: 125b725

* commit '125b725f46199b7058e437bb83f5d5179e1be73e':
  Remove AppWindowTokens from exiting apps with task
 2015-01-08 19:20:57 +00:00
Craig Mautner
125b725f46 Merge "Remove AppWindowTokens from exiting apps with task" into lmp-mr1-dev 
automerge: 62a32ee

* commit '62a32ee1dfff6921fd95c92068500af6b8b3f47e':
  Remove AppWindowTokens from exiting apps with task
 2015-01-08 19:13:38 +00:00
Craig Mautner
62a32ee1df Merge "Remove AppWindowTokens from exiting apps with task" into lmp-mr1-dev 2015-01-08 19:09:42 +00:00
Dianne Hackborn
29cd7f1962 Fix issue #18827122: system server crashed on broadcasting... 
...an intent with invalid or null package uri

Also tweak battery stats to record in the history when we shut
down, to understand when restarts are due to clean shutdowns or
crashes.

Change-Id: I6443dafc23e356be9f569906f6081152d4f92d2b
 2015-01-08 10:58:45 -08:00