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

179697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ruben Brunk
1bc109b928 am 8f8dc488: resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp. 
* commit '8f8dc4882bc61b7e273ac991e2ae99834d55b7d0':
  Camera2: Fix early EOF in DngCreator#writeByteBuffer.
 2015-01-10 01:24:55 +00:00
Ruben Brunk
8f8dc4882b resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp. 
Change-Id: Idbf96ab23c02dc7c380d6c3a4a87b1f380446c61
 2015-01-09 17:19:45 -08:00
Ruben Brunk
0f647c19f9 am 8c52d9a0: Merge "Camera2: Fix early EOF in DngCreator#writeByteBuffer." into lmp-mr1-dev 
* commit '8c52d9a092452837e7222d8416c3b4accf9a99d7':
  Camera2: Fix early EOF in DngCreator#writeByteBuffer.
 2015-01-09 23:37:07 +00:00
Ruben Brunk
8c52d9a092 Merge "Camera2: Fix early EOF in DngCreator#writeByteBuffer." into lmp-mr1-dev 2015-01-09 23:33:49 +00:00
ztenghui
5a880611cc Merge "Limit the scope of clip path to the group, not global" 2015-01-09 23:16:23 +00:00
Paul McLean
96798efe99 Merge "Support for simultaneous USB Audio Devices connect/disconnect" 2015-01-09 23:12:37 +00:00
Paul McLean
0a8f06922f Support for simultaneous USB Audio Devices connect/disconnect 
Attach/Detach logic
Decoupling card# and list index
Modern loop constructs
Consistent logging flags
Add class/type flags to device "address" string.
Factored UsbAudioDevice out of UsbAudioManager.

Bug: 18399845
Bug: 18717784

Change-Id: I6f185e1c24091d4c0d21eb7e922a1496748d32c3
 2015-01-09 14:56:43 -08:00
ztenghui
054a17caaa Limit the scope of clip path to the group, not global 
http://b/18758765

Change-Id: I899401a5fcbccd0421687bd5cf671f7751092195
 2015-01-09 14:53:47 -08:00
Ruben Brunk
a3fdec8dac Camera2: Fix early EOF in DngCreator#writeByteBuffer. 
Bug: 18962278
Change-Id: I8641a03d866930c86bdd2db0a29ccd5560712c90
 2015-01-09 13:48:31 -08:00
Christopher Tate
0c3e78c93f am a97fe138: Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev automerge: 68dabad 
automerge: f3ac99f

* commit 'f3ac99f2e093f851ca52bcd5aefb251046db10fa':
  Exclude ephemeral networks from wifi backup
 2015-01-09 20:25:31 +00:00
Christopher Tate
f3ac99f2e0 am a97fe138: Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev 
automerge: 68dabad

* commit '68dabada9e6e380ec0c6dacbc2ce7a46aa663a07':
  Exclude ephemeral networks from wifi backup
 2015-01-09 20:20:01 +00:00
Christopher Tate
68dabada9e am a97fe138: Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev 
* commit 'a97fe1387df731ddbbdae7c75dfbdfa4f1eb0339':
  Exclude ephemeral networks from wifi backup
 2015-01-09 20:16:21 +00:00
Christopher Tate
a97fe1387d Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev 2015-01-09 20:10:21 +00:00
Jeff Sharkey
df38a17020 am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev automerge: 0cb736f 
automerge: d6a8c32

* commit 'd6a8c32a6a2ac07f25f65622366ccb4ccffbdcdd':
  Guard against MountService throwing NPE.
 2015-01-09 19:29:24 +00:00
Jeff Sharkey
d6a8c32a6a am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev 
automerge: 0cb736f

* commit '0cb736f754d8f487ebe4c8cc670e5dd2589eaea1':
  Guard against MountService throwing NPE.
 2015-01-09 19:24:31 +00:00
Dianne Hackborn
1ed82edf1d am 2abf1f1c: Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev automerge: 54f9b1e automerge: a319aa8 
* commit '2abf1f1c212574ea7073584406ee86898f5d3779':
  Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
 2015-01-09 19:21:25 +00:00
Jeff Sharkey
0cb736f754 am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev 
* commit '2b46774ff950270365238e12e4a336e2004500e2':
  Guard against MountService throwing NPE.
 2015-01-09 19:21:24 +00:00
Jeff Sharkey
2b46774ff9 Merge "Guard against MountService throwing NPE." into lmp-mr1-dev 2015-01-09 19:14:29 +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
Chet Haase
0e5f8a45f7 Merge "Add backgroundColor getter to View" 2015-01-09 18:31:32 +00:00
Ariel Gertzenstein
d82f9988a9 am 4a207e3e: Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524" into lmp-mr1-dev automerge: cce8db2 automerge: b32831e 
* commit '4a207e3e52044839b035c2a0af9c240d31692422':
  Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524
 2015-01-09 18:11:50 +00: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
Chet Haase
5058c38a31 Add backgroundColor getter to View 
Change-Id: I3a75169a2e91ec712fb1db4d130089a1261fc66b
 2015-01-09 10:00:22 -08: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
faafecaa7d am e24637e6: am 7f7ea82c: Profile owner hint in warning for extra CAs automerge: 34f3ade 
* commit 'e24637e641ec1f39455f270a4d6050c4d0383515':
  Profile owner hint in warning for extra CAs
 2015-01-09 15:20:11 +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
Derek Sollenberger
304cc53874 Use the generic Canvas instead of SkCanvas 
bug: 18642206
Change-Id: I0dc3f6b620083e5948c2d4be541ae7c6261b3482
 2015-01-09 09:16:06 -05: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
Jim Miller
83eb4443a9 Merge "Remove unused string from keyguard_presentation." 2015-01-09 03:10:54 +00:00
Christopher Tate
cab915a327 Exclude ephemeral networks from wifi backup 
We compare the set of networks defined in the supplicant with the
set of networks described as "configured" by the Wifi Manager.  The
latter excludes ephemeral networks, so any network definition we
find in the supplicant data that we do not also find in the
configured network set, we ignore for backup purposes.

Bug 18917753

Change-Id: I8e0f258d0cdb72d7bf9482fafe64dc921419fcb2
 2015-01-08 19:05:04 -08:00
Shishir Agrawal
fee0c2f4ee am f53dda1c: am bde7bc45: GpsLocationProvider: Read data enabled status from TelephonyManager. automerge: 2db7977 
* commit 'f53dda1c5451ab083b414760bf1650255c356d71':
  GpsLocationProvider: Read data enabled status from TelephonyManager.
 2015-01-09 01:44:22 +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
Brian Attwell
cc4b2f731e Ubundle from contacts contract Part 1/3 
1. Remove Intents.UI
2. Expose Authority
3. Expose ProviderStatus

Discussion: go/contacts-contact-intent-ui

Bug: 18777272
Change-Id: I9c6125cc30710e4637b38f3785608abb9928d1a2
 2015-01-09 01:07:45 +00:00
Mathieu Chartier
c2c2e26fd4 Merge "Call VMRuntime.clampGrowthLimit for small heap apps" automerge: 9a6c45e automerge: 117ba18 
automerge: eb896e1

* commit 'eb896e1febd57eba541b8760bcd7010457598b85':
  Call VMRuntime.clampGrowthLimit for small heap apps
 2015-01-09 00:40:23 +00:00
Mathieu Chartier
eb896e1feb Merge "Call VMRuntime.clampGrowthLimit for small heap apps" automerge: 9a6c45e 
automerge: 117ba18

* commit '117ba186d1d28ae7eb6d1187c795e502668fa9b4':
  Call VMRuntime.clampGrowthLimit for small heap apps
 2015-01-09 00:28:33 +00:00
Mathieu Chartier
117ba186d1 Merge "Call VMRuntime.clampGrowthLimit for small heap apps" 
automerge: 9a6c45e

* commit '9a6c45eedd112313e5b24111f23bc309a3dc5df6':
  Call VMRuntime.clampGrowthLimit for small heap apps
 2015-01-09 00:20:53 +00:00
Mathieu Chartier
9a6c45eedd Merge "Call VMRuntime.clampGrowthLimit for small heap apps" 2015-01-09 00:17: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
Alan Viverette
4e5168fae4 Update year picker to use activation colors 
Change-Id: I148b592538e1e4a928bd7ebb99a3083b760b839d
 2015-01-08 15:25:30 -08:00
Robin Lee
1ea47aa083 am a92da1c2: am 2cc617b2: Merge "Revert "Profile owner hint in warning for extra CAs"" into lmp-mr1-dev automerge: bc7efed 
* commit 'a92da1c21aba700519f51f690fad28e6ca4154a6':
  Revert "Profile owner hint in warning for extra CAs"
 2015-01-08 22:48:54 +00:00
Mathieu Chartier
24cee07160 Call VMRuntime.clampGrowthLimit for small heap apps 
If the manifest doesn't specify large heaps, we now call
VMRuntime.clampGrowthLimit to release heap virtual address space
which won't ever get used.

Bug: 18387825
Bug: 17131630
Change-Id: I61fdcd70c70234256637eeebefe3abb22b91095d
 2015-01-08 14:42:20 -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