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

179666 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
adf1c93ff7 am 3968820f: am cb8d8e10: Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev automerge: 16e4324 
* commit '3968820fc75e1eac03e54cba45b5a0adc28ee87d':
  Fix issue #18827122: system server crashed on broadcasting...
 2015-01-08 21:55:28 +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
Lajos Molnar
1b4e87398a am 31ef8ef5: Merge "Use NULL instead of 0 when invoking CallStaticVoidMethod" into lmp-mr1-dev automerge: 92160ba 
automerge: a4f8397

* commit 'a4f8397d91c1d37b39cf24f3727b0ea15280a531':
  Use NULL instead of 0 when invoking CallStaticVoidMethod
 2015-01-08 20:32:35 +00:00
Adam Lesinski
e5b8a0896e am c04a21a0: Merge "Fixup aapt usage message" automerge: 64044d0 
automerge: 6e2eb2d

* commit '6e2eb2df4cb8ca4d0eeda0fb38e1a67136a0d275':
  Fixup aapt usage message
 2015-01-08 20:31:12 +00:00
Lajos Molnar
a4f8397d91 am 31ef8ef5: Merge "Use NULL instead of 0 when invoking CallStaticVoidMethod" into lmp-mr1-dev 
automerge: 92160ba

* commit '92160ba97dd2e54f6492b621452bbefe53f8285d':
  Use NULL instead of 0 when invoking CallStaticVoidMethod
 2015-01-08 20:28:04 +00:00
Lajos Molnar
92160ba97d am 31ef8ef5: Merge "Use NULL instead of 0 when invoking CallStaticVoidMethod" into lmp-mr1-dev 
* commit '31ef8ef5d0f98aa08b4c8247d1f252379d97a548':
  Use NULL instead of 0 when invoking CallStaticVoidMethod
 2015-01-08 20:24:33 +00:00
Adam Lesinski
6e2eb2df4c am c04a21a0: Merge "Fixup aapt usage message" automerge: 64044d0 
* commit 'c04a21a0ef6cd97a45307e4c1de9088e57719ca2':
  Fixup aapt usage message
 2015-01-08 20:24:33 +00:00
Lajos Molnar
31ef8ef5d0 Merge "Use NULL instead of 0 when invoking CallStaticVoidMethod" into lmp-mr1-dev 2015-01-08 20:19:00 +00:00
Adam Lesinski
c04a21a0ef Merge "Fixup aapt usage message" 
automerge: 64044d0

* commit '64044d0b7bc9aa46c60adcadce699d556e1c608e':
  Fixup aapt usage message
 2015-01-08 20:18:38 +00:00
Adam Lesinski
64044d0b7b Merge "Fixup aapt usage message" 2015-01-08 20:15:39 +00:00
RoboErik
effe42e253 Merge "Reload MediaBrowser children on each call to subscribe" 2015-01-08 19:54:34 +00:00
Alan Viverette
1a1779de29 Merge "Fix bad super call in PhoneStatusBarView accessibility" 2015-01-08 19:26:30 +00:00
Fyodor Kupolov
56ef86d4d1 Merge "Use scheduled writes to package-restrictions and user xml" 2015-01-08 19:25:45 +00:00
Craig Mautner
b533d116ef am 0e2fdb43: Merge "Remove AppWindowTokens from exiting apps with task" into lmp-mr1-dev automerge: 62a32ee automerge: 125b725 
* commit '0e2fdb43122c53c3a63bc3810c93c30083d92866':
  Remove AppWindowTokens from exiting apps with task
 2015-01-08 19:24:57 +00:00
Sanket Padawe
8b2a15ed39 am b3096a34: Merge "Removing DUN APN for Koodo CA (302-220)" into lmp-mr1-dev automerge: d3b6956 automerge: 720b3a0 
* commit 'b3096a344e739300d11d31207a2744b2b0870a08':
  Removing DUN APN for Koodo CA (302-220)
 2015-01-08 19:24:52 +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
Alan Viverette
23afdde42c Merge "Use text ascent / descent to center SimpleMonthView labels" 2015-01-08 19:16:30 +00:00
Sanket Padawe
b3096a344e Merge "Removing DUN APN for Koodo CA (302-220)" into lmp-mr1-dev automerge: d3b6956 
automerge: 720b3a0

* commit '720b3a04a499d1ed516a37a8eadade9c8fb15f51':
  Removing DUN APN for Koodo CA (302-220)
 2015-01-08 19:16:29 +00:00
John Reck
25bd5d6b04 Merge "Replace sleep() hack with vsync listening" 2015-01-08 19:15:31 +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
Alan Viverette
5b0467522c Fix bad super call in PhoneStatusBarView accessibility 
Change-Id: Ie18e6c9b74dce498c1c830ce983a73aa619c6df3
 2015-01-08 11:13:06 -08:00
Alan Viverette
5dc973cb03 Use text ascent / descent to center SimpleMonthView labels 
Also updates Canvas.drawText() docs to clarify that the y-origin is
actually the baseline rather than the top (which is what developers
expect).

BUG: 18864682
Change-Id: Ibfa2a79327d17b5135f90468195fbeca922a25c8
 2015-01-08 11:12:39 -08:00
Sanket Padawe
720b3a04a4 Merge "Removing DUN APN for Koodo CA (302-220)" into lmp-mr1-dev 
automerge: d3b6956

* commit 'd3b69567e3b6891574b8f06e3fc88ba91d4f7436':
  Removing DUN APN for Koodo CA (302-220)
 2015-01-08 19:12:28 +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
Haitao Feng
67f304e2ca Use NULL instead of 0 when invoking CallStaticVoidMethod 
static void CallStaticVoidMethod is variable argument function.
if pass 0 to the function like: CallStaticVoidMethod(......, 0),
0 will be treated as INT data type.but in the CallStaticVoidMethod
implement 0 will be treated as pointer data type.Pointer in 64bit
system occupied 8 bytes, but in 64bit system int occupied 4 bytes.
if call function like: CallStaticVoidMethod(......, 0),
only low 4 bytes will be assigned 0.Turned out it actually call
function like this: CallStaticVoidMethod(......, 0xXXXXXXXX00000000).
intent to pass NULL to function but passed non-NULL parameter to
the function.this will cause GCDaemon crash.

Bug: 18911458
Change-Id: I9d700d3790a80dbee6826f64baf9ef5d81ca390f
Reviewed-by: Liao, Bruce <bruce.liao@intel.com>
Signed-off-by: Yong Yao <yong.yao@intel.com>
 2015-01-08 19:09:22 +00:00
Sanket Padawe
d3b69567e3 Merge "Removing DUN APN for Koodo CA (302-220)" into lmp-mr1-dev 2015-01-08 19:08:08 +00:00