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

23071 Commits

Author SHA1 Message Date
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
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
Craig Mautner
3d7ca31c9e Remove AppWindowTokens from exiting apps with task 
When the task is removed from a task stack in window manager any
exiting activities left in the stack were orphaned. This led to a
memory leak. Removing all task activities from those that are exiting
fixes this problem.

Fixes bug 18943737.

Change-Id: I0a5ea8d2d3be89af7ccaf01385a226a2eafdf507
 2015-01-08 10:56:00 -08:00
Christoph Studer
f5dcb6cbb9 am 9d4b7963: Merge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-dev 
automerge: bbadf11

* commit 'bbadf1161aacafd80182dda080534a123a7204ef':
  NoMan: Cancel previous instance of ignored notification
 2015-01-08 18:51:48 +00:00
Christoph Studer
bbadf1161a am 9d4b7963: Merge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-dev 
* commit '9d4b7963399045395799dcb7df5d8c84d9b12884':
  NoMan: Cancel previous instance of ignored notification
 2015-01-08 18:49:53 +00:00
Christoph Studer
9d4b796339 Merge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-dev 2015-01-08 18:44:24 +00:00
Craig Mautner
28a4cea5a0 Merge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-dev 2015-01-08 18:34:02 +00:00
Dianne Hackborn
8fa0935335 Merge "Add new debug feature to track associations between processes. Also add some debugging for spurious service ANRs." into lmp-mr1-dev automerge: a7881fd 
automerge: 30ae442

* commit '30ae442133c55d4aa3636127de556736b2eaa99f':
  Add new debug feature to track associations between processes.  Also add some debugging for spurious service ANRs.
 2015-01-08 18:17:33 +00:00
Dianne Hackborn
30ae442133 Merge "Add new debug feature to track associations between processes. Also add some debugging for spurious service ANRs." into lmp-mr1-dev 
automerge: a7881fd

* commit 'a7881fd30b973f923c98d53bddf397d744b4229c':
  Add new debug feature to track associations between processes.  Also add some debugging for spurious service ANRs.
 2015-01-08 18:11:31 +00:00
Dianne Hackborn
a7881fd30b Merge "Add new debug feature to track associations between processes. Also add some debugging for spurious service ANRs." into lmp-mr1-dev 2015-01-08 18:08:13 +00:00
Andres Morales
7628fac99f Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev automerge: d656955 
automerge: c9a7694

* commit 'c9a76941ecca457e6a17b06f557c24e18e3bdafa':
  Wipe FRP partition if OEM unlock enabled
 2015-01-08 16:15:47 +00:00
Andres Morales
c9a76941ec Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev 
automerge: d656955

* commit 'd656955efdd2e148d9390125b899e8fe2b677abd':
  Wipe FRP partition if OEM unlock enabled
 2015-01-08 16:13:17 +00:00
Andres Morales
d656955efd Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev 2015-01-08 16:10:27 +00:00
tingna_sung
1ab7d3b9a8 Fix pointer index out of range exception DO NOT MERGE 
Avoid pointer index out of range error if return value is -1 of
findPointerIndex() when there is no data available for that pointer
identifier.

Change-Id: I2a08f04c678164e220852094baa124ba157e2e42
Signed-off-by: tingna_sung <tingna_sung@htc.com>

Fixes bug 18883936
 2015-01-08 15:57:52 +00:00
Bryce Lee
1cad8899be Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev automerge: c010c96 
automerge: d1646dc

* commit 'd1646dcfd1d40bdc094f34e05c1359cfc3fa7c65':
  Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
 2015-01-08 04:38:01 +00:00
Bryce Lee
d1646dcfd1 Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev 
automerge: c010c96

* commit 'c010c96fdf143b242c9795a71b231ccb4658b625':
  Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
 2015-01-08 04:32:40 +00:00
Bryce Lee
c010c96fdf Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev 2015-01-08 04:30:13 +00:00
Jinsuk Kim
764a1ba86d am 62a1e753: Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput" into lmp-mr1-dev automerge: 09d4e03 
* commit '62a1e753b1f73f575c978a377efdc531e7a86b8f':
  CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput
 2015-01-08 04:18:01 +00:00
Jinsuk Kim
62a1e753b1 Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput" into lmp-mr1-dev 
automerge: 09d4e03

* commit '09d4e03736caa1baf07256fc5cd6d61b264021a7':
  CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput
 2015-01-08 04:11:47 +00:00
Jinsuk Kim
6e26f7f7b0 CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput 
Resolves a timing-related bug that fails to process the command
<Active Source> at TV boot up. Checks if TV input required for
the command is ready to accept the request. If not, makes sure
the command is buffered, and processed later when the input is
ready.

Bug: 18896770

Change-Id: Id17e5e8468519b17daf61c962dd718ccc56fb0ea
 2015-01-08 12:51:22 +09:00
Bryce Lee
7c91446769 Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." 
This reverts commit fabbdf7204474a9f789ce441219b3b9f3df66bb8.

Causes NPE on devices without telephony (Android Wear for example)
Bug:18922524

Change-Id: I3be4187a20da11fd5a302dd88e808a68cd7e5737
 2015-01-08 02:32:08 +00:00
Christopher Tate
e04518866e am 413ec4a6: am bee49807: Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev 
* commit '413ec4a6573ffa88bf02a796eb8c9dc7dfa839ca':
  Support single-package backup rejection by the transport
 2015-01-07 23:30:34 +00:00
Christopher Tate
413ec4a657 am bee49807: Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev 
* commit 'bee49807dde9f19d5163e87b71fe17392bfe857c':
  Support single-package backup rejection by the transport
 2015-01-07 23:23:14 +00:00
Christopher Tate
bee49807dd Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev 2015-01-07 23:19:50 +00:00
Andres Morales
1ce7d179bf Wipe FRP partition if OEM unlock enabled 
Not all devices invoke recovery on every userdata wipe,
so we can't rely on code in the
recovery OS to do this. This results in fastboot -w
not properly wiping the FRP partition. This patch
fixes the issue by having the framework level service
check the OEM unlock enabled bit, and wiping the partition
if it is set.

Bug: 18644051
Change-Id: Id97a29916fe39561700912a920c5741109842bdb
 2015-01-07 14:46:19 -08:00
RoboErik
516fa49183 am 13d1057d: am 2610d712: Don\'t unmute when trying to show volume UI. DO NOT MERGE 
* commit '13d1057d5b3ca46d00d627a89f0d37836b9db8fd':
  Don't unmute when trying to show volume UI. DO NOT MERGE
 2015-01-07 22:06:47 +00:00
Dianne Hackborn
ab2df067fc Add new debug feature to track associations between processes. Also 
add some debugging for spurious service ANRs.

Bug: 18201239
Change-Id: Icd43f35c696d71453e1d4deea855984b2d14b347
 2015-01-07 14:01:13 -08:00
RoboErik
13d1057d5b am 2610d712: Don\'t unmute when trying to show volume UI. DO NOT MERGE 
* commit '2610d71251e3e376e2514f20986c81e5d55f1b55':
  Don't unmute when trying to show volume UI. DO NOT MERGE
 2015-01-07 22:00:28 +00:00
RoboErik
2610d71251 Don't unmute when trying to show volume UI. DO NOT MERGE 
When a MediaSession is active the adjust volume event to show UI was
causing the stream to be unmuted. Since this happens after every mute
event you were unable to mute while a session was active. This change
doesn't unmute for events that just show the UI.

bug:18844550
Change-Id: Ic8b0f1ab1354646724ead4572a973c302c275eab
 2015-01-07 20:13:31 +00:00
Wale Ogunwale
df3d1307d5 am 6763058f: am f61bc8a2: Merge "Bring task with root activity to front when launching from recents." into lmp-mr1-dev 
* commit '6763058fe74c31bd44b8c94e2911c72e9db68e97':
  Bring task with root activity to front when launching from recents.
 2015-01-07 18:14:39 +00:00
Wale Ogunwale
6763058fe7 am f61bc8a2: Merge "Bring task with root activity to front when launching from recents." into lmp-mr1-dev 
* commit 'f61bc8a2624bc70c903238229a62abc3351ed620':
  Bring task with root activity to front when launching from recents.
 2015-01-07 18:08:55 +00:00
Wale Ogunwale
f61bc8a262 Merge "Bring task with root activity to front when launching from recents." into lmp-mr1-dev 2015-01-07 18:02:41 +00:00
Robin Lee
23bb3f11cb am 26e2da8f: am 374c358d: Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev 
* commit '26e2da8ff8bdd577c915620c93805f21ff1fd65e':
  Profile owner hint in warning for extra CAs
 2015-01-07 12:41:44 +00:00
Robin Lee
26e2da8ff8 am 374c358d: Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev 
* commit '374c358dd201583771b7aa391c56618548f543a6':
  Profile owner hint in warning for extra CAs
 2015-01-07 12:36:11 +00:00
Robin Lee
374c358dd2 Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev 2015-01-07 12:30:57 +00:00