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

121732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vince Harron
165b965edb am 4f50911a: am e9a4e9de: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that 
* commit '4f50911aa18f9d4650c6721456dd05ac499fcefd':
  Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
 2014-04-25 23:25:11 +00:00
Vince Harron
4f50911aa1 am e9a4e9de: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don\'t allocat 
* commit 'e9a4e9deaad6a3185269bf5696c2a2946962fbd2':
  Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
 2014-04-25 23:22:07 +00:00
Vince Harron
e9a4e9deaa Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory." into klp-ub-dev 2014-04-25 23:17:37 +00:00
Ricardo Cervera
9d7c58cf8b am 6fe328c6: am 86afa0b5: am 039bd508: Merge "docs: Added release notes for ADT 22.6.3" into klp-docs 
* commit '6fe328c62abd3b98aceeeb99aaf5d824bd42adc6':
  docs: Added release notes for ADT 22.6.3
 2014-04-25 22:37:45 +00:00
Ricardo Cervera
6fe328c62a am 86afa0b5: am 039bd508: Merge "docs: Added release notes for ADT 22.6.3" into klp-docs 
* commit '86afa0b56bf8af0a2c94fcabf5eb7f64f6c66c2d':
  docs: Added release notes for ADT 22.6.3
 2014-04-25 22:33:25 +00:00
Ricardo Cervera
86afa0b56b am 039bd508: Merge "docs: Added release notes for ADT 22.6.3" into klp-docs 
* commit '039bd50825f7ea8b706c8ea6e54a1c893759309d':
  docs: Added release notes for ADT 22.6.3
 2014-04-25 22:21:10 +00:00
Ricardo Cervera
039bd50825 Merge "docs: Added release notes for ADT 22.6.3" into klp-docs 2014-04-25 22:15:28 +00:00
Mark Salyzyn
a19b9c413b am dfdeabf9: am ac732708: Merge "EventLog: event log translation errors" 
* commit 'dfdeabf9ba40ea7f082acf7eba6fe086d2e643fb':
  EventLog: event log translation errors
 2014-04-25 22:07:07 +00:00
Mark Salyzyn
dfdeabf9ba am ac732708: Merge "EventLog: event log translation errors" 
* commit 'ac7327082c411617f7937b87575c117bd63ad9df':
  EventLog: event log translation errors
 2014-04-25 22:03:20 +00:00
Mark Salyzyn
ac7327082c Merge "EventLog: event log translation errors" 2014-04-25 21:59:19 +00:00
Mark Salyzyn
747802f8aa EventLog: event log translation errors 
- Deal with L using v3 event log format, or K using v1 or v2 event log format

Change-Id: Id4fb205f51b7e506135888d565acf1604497b91f
 2014-04-25 13:45:03 -07:00
Craig Mautner
cb48b96223 am 1a7e9e66: Merge "Throw exception from startActivity if not allowed." into klp-modular-dev 
* commit '1a7e9e66a6de039da8f567a2087d9bce34820746':
  Throw exception from startActivity if not allowed.
 2014-04-25 18:45:06 +00:00
Craig Mautner
1a7e9e66a6 Merge "Throw exception from startActivity if not allowed." into klp-modular-dev 2014-04-25 18:39:46 +00:00
Craig Mautner
247ab65a49 Throw exception from startActivity if not allowed. 
The ActivityView.startActivity method may defer calling
ActivityContainer.startActivity if the ActivityView is not yet
visible. If the activity being started doesn't have allowEmbedded
attribute set to true then the SecurityException will not be
thrown until the ActivityView is visible. In such a case the caller
of ActivityView.startActivity cannot catch the SecurityException.

This fix checks the attribute at the time ActivityView.startActivity
is called.

Fixes bug 14317210.

Change-Id: I7fff23e39b67a9a0aa1b2e555920d02ae38906d9
 2014-04-25 11:20:01 -07:00
Yuling Liang
69a9d92502 am eea94f06: Merge "Revert "Followon fix for 14276128 Clipping at bottom of TextView"" into klp-modular-dev 
* commit 'eea94f060a917a5c6195a81d8825551a430a8d69':
  Revert "Followon fix for 14276128 Clipping at bottom of TextView"
 2014-04-25 17:35:52 +00:00
Yuling Liang
eea94f060a Merge "Revert "Followon fix for 14276128 Clipping at bottom of TextView"" into klp-modular-dev 2014-04-25 17:32:28 +00:00
Yuling Liang
10973c7776 Revert "Followon fix for 14276128 Clipping at bottom of TextView" 
This reverts commit a10e19845ce76c0e4dd38018c84b83c9255dc9fe.

Change-Id: I6d40451c9eb6285859e16d251b55947663a3553a
 2014-04-25 17:32:08 +00:00
Yuling Liang
60f8349b98 am 243e551a: Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev 
* commit '243e551ac380f86639eee3e95a482d8e17836670':
  Followon fix for 14276128 Clipping at bottom of TextView
 2014-04-25 16:34:15 +00:00
Yuling Liang
243e551ac3 Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev 2014-04-25 16:30:12 +00:00
Marco Nelissen
ebd6a2d271 am eded9e3b: am adcf38c9: Merge "Release DrmManagerClient resources" 
* commit 'eded9e3b7f6f30526365461a25624b841611af28':
  Release DrmManagerClient resources
 2014-04-25 14:52:18 +00:00
Marco Nelissen
eded9e3b7f am adcf38c9: Merge "Release DrmManagerClient resources" 
* commit 'adcf38c9936fa372309d413cec03a1413e797c7a':
  Release DrmManagerClient resources
 2014-04-25 14:46:35 +00:00
Marco Nelissen
adcf38c993 Merge "Release DrmManagerClient resources" 2014-04-25 14:42:02 +00:00
Craig Mautner
e5889679f6 am 3a656ea3: Merge "Too soon." into klp-modular-dev 
* commit '3a656ea32e6d6489f4bc45884e5acede9fe2de51':
  Too soon.
 2014-04-25 03:06:34 +00:00
Craig Mautner
3a656ea32e Merge "Too soon." into klp-modular-dev 2014-04-25 03:03:37 +00:00
Craig Mautner
2e46e65e9d Too soon. 
Change-Id: I1abb1d4841e4e6342c3b861d33ae22e22ed0a161
 2014-04-25 03:01:40 +00:00
Selim Gurun
7466e3bbbd am e3fc3073: am 8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl." 
* commit 'e3fc3073826b4fdfa0d1be17fe0c79ccf211ad7d':
  Add a stub for forgotten callback to fix master-gpl.
 2014-04-25 01:15:36 +00:00
Selim Gurun
e3fc307382 am 8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl." 
* commit '8c2d70f5e8dfe64213f44c29562fe4240779b68b':
  Add a stub for forgotten callback to fix master-gpl.
 2014-04-25 01:12:46 +00:00
Selim Gurun
8c2d70f5e8 Merge "Add a stub for forgotten callback to fix master-gpl." 2014-04-25 01:08:48 +00:00
Selim Gurun
4e48f40b03 Add a stub for forgotten callback to fix master-gpl. 
Change-Id: I375dba89403d09dc39f696de04e0811633ecc803
 2014-04-24 18:04:04 -07:00
Selim Gurun
a697268442 am f7a19173: am adad989b: Merge "Add a stub to fix master-gpl" 
* commit 'f7a191731f6c840eed9283652648f267589502c2':
  Add a stub to fix master-gpl
 2014-04-25 00:47:23 +00:00
Craig Mautner
fbb0796eb3 am 3359bbe0: Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev 
* commit '3359bbe02ca645bae2f495df51e7b4001de6c2b1':
  Add test for attribute android:allowEmbedded
 2014-04-25 00:42:25 +00:00
Selim Gurun
f7a191731f am adad989b: Merge "Add a stub to fix master-gpl" 
* commit 'adad989b6a2c736f427526e747dcb89ed9762bab':
  Add a stub to fix master-gpl
 2014-04-25 00:41:59 +00:00
Selim Gurun
adad989b6a Merge "Add a stub to fix master-gpl" 2014-04-25 00:39:10 +00:00
Craig Mautner
3359bbe02c Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev 2014-04-25 00:39:06 +00:00
Selim Gurun
85b89bf7a3 Add a stub to fix master-gpl 
Change-Id: I4cadd3a6e33843ccac4ef2eacbe508e40628367c
 2014-04-24 17:31:07 -07:00
Elliott Hughes
02e857441f am 5f5ca3bc: am 31a1dd2a: Merge "Use the suggested public API instead of libcore.os." 
* commit '5f5ca3bc98fb773ee905289300595ad95d5ffabe':
  Use the suggested public API instead of libcore.os.
 2014-04-24 23:59:05 +00:00
Elliott Hughes
5f5ca3bc98 am 31a1dd2a: Merge "Use the suggested public API instead of libcore.os." 
* commit '31a1dd2a8f56b439861ee335b55f44323318830c':
  Use the suggested public API instead of libcore.os.
 2014-04-24 23:55:09 +00:00
Elliott Hughes
31a1dd2a8f Merge "Use the suggested public API instead of libcore.os." 2014-04-24 23:52:16 +00:00
Andrew Solovay
9a4db3114b am 3cb4430b: am 27547e6d: am fdc9e56f: Correcting name of \'Backup & reset\' menu. 
* commit '3cb4430b071e9e978853f73c0cccd15dc2f37a49':
  Correcting name of 'Backup & reset' menu.
 2014-04-24 23:45:09 +00:00
Andrew Solovay
3cb4430b07 am 27547e6d: am fdc9e56f: Correcting name of \'Backup & reset\' menu. 
* commit '27547e6d3a22fb9615594769e460c6a86f2dd44b':
  Correcting name of 'Backup & reset' menu.
 2014-04-24 23:41:26 +00:00
Andrew Solovay
27547e6d3a am fdc9e56f: Correcting name of \'Backup & reset\' menu. 
* commit 'fdc9e56ff8a1019c353e77f5d4b5f3566d173941':
  Correcting name of 'Backup & reset' menu.
 2014-04-24 23:37:40 +00:00
Elliott Hughes
cacbe1b1ef Use the suggested public API instead of libcore.os. 
Change-Id: Id392e4c36c5721ca609d88d9ec6b9340ce05274c
 2014-04-24 16:19:27 -07:00
Andrew Solovay
fdc9e56ff8 Correcting name of 'Backup & reset' menu. 
Doc is staged at
http://asolovay.mtv.corp.google.com:9000/guide/topics/data/backup.html#Testing

Bug: 14253720
Change-Id: Ib8eb213d8708c02c93c8bc93233db2c828caa925
 2014-04-24 15:59:45 -07:00
Mark Salyzyn
fc02fcc8a4 am eacaa353: am c717179e: Merge "jni: android_util_Process 64 bit issues" 
* commit 'eacaa353e83942d3c59d0db594df0fb6179e0eea':
  jni: android_util_Process 64 bit issues
 2014-04-24 22:17:11 +00:00
Mark Salyzyn
eacaa353e8 am c717179e: Merge "jni: android_util_Process 64 bit issues" 
* commit 'c717179e4fec346334fe4bb8603184499b746179':
  jni: android_util_Process 64 bit issues
 2014-04-24 22:14:02 +00:00
Mark Salyzyn
c717179e4f Merge "jni: android_util_Process 64 bit issues" 2014-04-24 22:10:22 +00:00
Mark Salyzyn
c6a410164e jni: android_util_Process 64 bit issues 
- critical issue with using %lld to scanf into a jlong
- subsidiary issues with mix jint, jsize and jlong printing

Change-Id: I77c6b3d3a202fec741cacc540fc39ad6cba25f52
 2014-04-24 13:09:15 -07:00
Raph Levien
a10e19845c Followon fix for 14276128 Clipping at bottom of TextView 
The previous fix did not work when the text was ellipsized, because the
test for whether the line was the last line was incorrect. The new test
handles both the end of the buffer and the case where it is the last
line because of ellipsizing.

So this should be the proper fix for bug 14276128 Clipping at bottom of
TextView when lineSpacingMultiplier < 1

Change-Id: Iac5c96f2273142031c18a27f504f7d6d5fcf823e
 2014-04-24 20:00:05 +00:00
Nick Kralevich
69ee6b0a77 am 140dc63f: am 84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server" 
* commit '140dc63f4f927a8eddddf8d11a142e6975c1c6cf':
  Zygote: enable CAP_BLOCK_SUSPEND capability for system server
 2014-04-24 18:25:58 +00:00
Nick Kralevich
140dc63f4f am 84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server" 
* commit '8480384986c314bd97b841cbf7f63acb7055ecef':
  Zygote: enable CAP_BLOCK_SUSPEND capability for system server
 2014-04-24 18:22:20 +00:00