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

121679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Christie
2df85bbb11 Merge "Clear cached locations when location providers disabled Bug: 12118307" 2013-12-19 00:39:35 +00:00
Stephen Hines
9fea4caf5b am ad5ee2f4: (-s ours) am 7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer." 
* commit 'ad5ee2f40a1b248aea49657e9f7155daac4cf65e':
  DO NOT MERGE - Fix improper declaration/use of pointer.
 2013-12-18 16:36:39 -08:00
Baligh Uddin
986859998c Import translations. DO NOT MERGE 
Change-Id: I3fa88a4097e6971c92bda10756ffd3699276bac3
Auto-generated-cl: translation import
 2013-12-18 16:36:21 -08:00
Stephen Hines
8e29181419 Merge "Fix improper declaration/use of pointer." 2013-12-19 00:36:01 +00:00
Stephen Hines
a0eabfbc41 Fix improper declaration/use of pointer. 
https://code.google.com/p/android/issues/detail?id=61547

This variable is shadowing the outer "ptr" declaration, resulting in a
potential NULL pointer being passed to the message API.

Change-Id: If96bfae8d5e874e12597182678a180ba137b78da
 2013-12-18 16:33:49 -08:00
Stephen Hines
ad5ee2f40a am 7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer." 
* commit '7f8c70a1a48df91ee5541b03dc380c08ab6ebf42':
  DO NOT MERGE - Fix improper declaration/use of pointer.
 2013-12-18 16:32:59 -08:00
Baligh Uddin
9d5a18c532 am ac143244: (-s ours) am f5570908: (-s ours) am 53ca3018: (-s ours) am 17b489f3: (-s ours) am 50391871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ac1432443d11deb3dd5aa3ee2697312becfe75ae':
  Import translations. DO NOT MERGE
 2013-12-19 00:31:45 +00:00
Baligh Uddin
f3df0f2757 am bac5ab53: (-s ours) am cdbf1e0c: (-s ours) am 200bd4d8: (-s ours) am 142be9ce: (-s ours) am db41eaef: (-s ours) Import translations. DO NOT MERGE 
* commit 'bac5ab53c40ddb222c16bcb8e3ac422ae8e8e2fd':
  Import translations. DO NOT MERGE
 2013-12-19 00:31:40 +00:00
Stephen Hines
7f8c70a1a4 Merge "DO NOT MERGE - Fix improper declaration/use of pointer." 2013-12-19 00:30:26 +00:00
Baligh Uddin
ac1432443d am f5570908: (-s ours) am 53ca3018: (-s ours) am 17b489f3: (-s ours) am 50391871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f5570908a5acc1f68128c974abcfb0117a44589d':
  Import translations. DO NOT MERGE
 2013-12-19 00:28:31 +00:00
Baligh Uddin
bac5ab53c4 am cdbf1e0c: (-s ours) am 200bd4d8: (-s ours) am 142be9ce: (-s ours) am db41eaef: (-s ours) Import translations. DO NOT MERGE 
* commit 'cdbf1e0c5bc133cd4f8f8d6e86c28eabc0812730':
  Import translations. DO NOT MERGE
 2013-12-19 00:28:26 +00:00
Baligh Uddin
f5570908a5 am 53ca3018: (-s ours) am 17b489f3: (-s ours) am 50391871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '53ca3018beb1a7a12d12cddfbc433d50ca793cf9':
  Import translations. DO NOT MERGE
 2013-12-19 00:25:00 +00:00
Baligh Uddin
cdbf1e0c5b am 200bd4d8: (-s ours) am 142be9ce: (-s ours) am db41eaef: (-s ours) Import translations. DO NOT MERGE 
* commit '200bd4d814fc4dc759191968f436104586cd339b':
  Import translations. DO NOT MERGE
 2013-12-19 00:24:56 +00:00
Stephen Hines
57cf560719 DO NOT MERGE - Fix improper declaration/use of pointer. 
https://code.google.com/p/android/issues/detail?id=61547

This variable is shadowing the outer "ptr" declaration, resulting in a
potential NULL pointer being passed to the message API.

Change-Id: If96bfae8d5e874e12597182678a180ba137b78da
 2013-12-18 16:24:21 -08:00
Baligh Uddin
53ca3018be am 17b489f3: (-s ours) am 50391871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '17b489f374fc878e2118a095511e209dd69ce3d4':
  Import translations. DO NOT MERGE
 2013-12-18 16:20:16 -08:00
Baligh Uddin
200bd4d814 am 142be9ce: (-s ours) am db41eaef: (-s ours) Import translations. DO NOT MERGE 
* commit '142be9ce6beaca5e0949176a0a8775ba4cd9dc99':
  Import translations. DO NOT MERGE
 2013-12-18 16:20:12 -08:00
Baligh Uddin
17b489f374 am 50391871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '50391871e61e491cf766fc83e261a8345d1cb5b6':
  Import translations. DO NOT MERGE
 2013-12-18 16:16:30 -08:00
Baligh Uddin
142be9ce6b am db41eaef: (-s ours) Import translations. DO NOT MERGE 
* commit 'db41eaef9036d069edd46d101cfa927e3a4cb694':
  Import translations. DO NOT MERGE
 2013-12-18 16:16:25 -08:00
Baligh Uddin
0b96c6ce3f Merge "Import translations. DO NOT MERGE" 2013-12-19 00:14:29 +00:00
Baligh Uddin
50391871e6 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-12-19 00:14:26 +00:00
Baligh Uddin
3c5fe29ed2 Import translations. DO NOT MERGE 
Change-Id: I8ece286ac0320cfbc03a0149fdb44675d425c062
Auto-generated-cl: translation import
 2013-12-18 16:01:23 -08:00
Baligh Uddin
3cc579ebac Import translations. DO NOT MERGE 
Change-Id: I30e27dc30d542e9f2d3a23b3b1831cbd99e4b920
Auto-generated-cl: translation import
 2013-12-18 15:37:22 -08:00
Baligh Uddin
db41eaef90 Import translations. DO NOT MERGE 
Change-Id: Id35b27dea34c2fbad7dcfe2b30a34b26beb4e989
Auto-generated-cl: translation import
 2013-12-18 15:11:27 -08:00
Craig Mautner
4a1cb22056 Pair ActivityStacks with Displays 
- Introduce concept of ActivityStacks residing on Displays and able
to be decoupled and moved around.
- Add a new interface, IActivityContainer for clients to handle
ActivityStacks.
- Abandon ordering of stacks based on mStackState and instead use
ActivityDisplayInfo.stacks<ActivityStack> ordering.

Progress towards closing bug 12078972.

Change-Id: I7785b61c26dc17f432a4803eebee07c7415fcc1f
 2013-12-18 15:08:15 -08:00
David Christie
b084fef18e Clear cached locations when location providers disabled 
Bug: 12118307

Change-Id: I0fa509791281038b8546d0648f4e17091ccf9c80
 2013-12-18 14:35:06 -08:00
Tor Norbye
0c34ee698e Merge "Hide NonNull and Nullable." 2013-12-18 22:22:14 +00:00
Scott Main
ffb96bf3b1 am 3bcdbd6b: am 6fda5415: am 709dca44: am fb214e6b: am 3032999b: Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution techni 
* commit '3bcdbd6b2d96427d7cee835e9ed79aeed51de267':
  Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification
 2013-12-18 18:29:37 +00:00
Scott Main
3bcdbd6b2d am 6fda5415: am 709dca44: am fb214e6b: am 3032999b: Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match 
* commit '6fda5415e07564b2e8ff000db5635e31d1e6f357':
  Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification
 2013-12-18 18:25:34 +00:00
Narayan Kamath
94ee2f502e am 52ba48a8: am f08b83be: am 4dd5c377: am be8fbb8f: Merge "Remove unused field from MediaMuxer" 
* commit '52ba48a85049a2a782c3e4c23d64577253f888eb':
  Remove unused field from MediaMuxer
 2013-12-18 18:25:33 +00:00
Scott Main
6fda5415e0 am 709dca44: am fb214e6b: am 3032999b: Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, c 
* commit '709dca4474549772dccabc2f8cd214798f965a39':
  Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification
 2013-12-18 18:22:05 +00:00
Narayan Kamath
52ba48a850 am f08b83be: am 4dd5c377: am be8fbb8f: Merge "Remove unused field from MediaMuxer" 
* commit 'f08b83beeef66b603dd3df1140e35f8e3f94d344':
  Remove unused field from MediaMuxer
 2013-12-18 18:20:42 +00:00
Narayan Kamath
f08b83beee am 4dd5c377: am be8fbb8f: Merge "Remove unused field from MediaMuxer" 
* commit '4dd5c37711f370af4c507eedd4c7d27ec35a2d64':
  Remove unused field from MediaMuxer
 2013-12-18 18:18:04 +00:00
Scott Main
709dca4474 am fb214e6b: am 3032999b: Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify sectio 
* commit 'fb214e6b108e84f7f55bee378c5c539a723b0569':
  Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification
 2013-12-18 10:17:33 -08:00
Narayan Kamath
4dd5c37711 am be8fbb8f: Merge "Remove unused field from MediaMuxer" 
* commit 'be8fbb8fb63fddac2310dfbafa2594ed165b16b1':
  Remove unused field from MediaMuxer
 2013-12-18 10:14:45 -08:00
Scott Main
fb214e6b10 am 3032999b: Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, p 
* commit '3032999bf35cd6a0f1643faacf08370ab69d979c':
  Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification
 2013-12-18 18:14:12 +00:00
Scott Main
3032999bf3 Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification" into klp-docs 2013-12-18 18:11:50 +00:00
Narayan Kamath
be8fbb8fb6 Merge "Remove unused field from MediaMuxer" 2013-12-18 18:08:58 +00:00
Scott Main
326ed257b1 Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) 
clarifications about different external directories,
information about required permissions,
intent resolution technique to match other docs,
clarify section headings, plus other code clarification

Change-Id: I62e3692a53bcd724676c74dc2c98eb72bcf58e1e
 2013-12-18 09:58:15 -08:00
Narayan Kamath
535daa191b Remove unused field from MediaMuxer 
Change-Id: If1ebb2302654b64924084a52425366f1b69c7c30
 2013-12-18 17:58:11 +00:00
Narayan Kamath
f11dd63e0c MediaDrm#mNativeContext is a long, not int. 
Therefore, we must use SetLongField and not SetIntField.

Change-Id: I2a805dd6b7c8e4905e742d8632d941f381a05930
 2013-12-18 16:58:36 +00:00
Victoria Lease
868399cdf4 Merge "pass SkGlyphCache into updateGlyphCache()" 2013-12-18 15:25:24 +00:00
Narayan Kamath
65048bdce7 Remove data dirs if a new install fails dexopt. 
We'd otherwise leave the data dirs & native libraries
lying around. This will leave the app permanently broken
because the next install of the app will fail with
INSTALL_FAILED_UID_CHANGED.

Also remove an unnecessary instance variable.

Change-Id: I50e08623f646a89bc166bded6a43e17c17930e58
 2013-12-18 14:27:36 +00:00
Narayan Kamath
27dd94aaad resolved conflicts for merge of d1cec98e to master 
Empty merge of a non-skippable change. This file has
moved to a different git repository.

Change-Id: Ia36001f4f37593c5290cd321485d89ea97f5b606
 2013-12-18 13:10:58 +00:00
Narayan Kamath
d1cec98ec5 am 04d02d97: am 39d76302: am 3da645f3: Merge "Don\'t pseudolocalize untranslatable strings." 
* commit '04d02d9731e0a199d22ad1408cbca1d39bdc4c91':
  Don't pseudolocalize untranslatable strings.
 2013-12-18 13:05:44 +00:00
Narayan Kamath
04d02d9731 am 39d76302: am 3da645f3: Merge "Don\'t pseudolocalize untranslatable strings." 
* commit '39d7630234127327d71a773dd563067989da4211':
  Don't pseudolocalize untranslatable strings.
 2013-12-18 13:02:39 +00:00
Narayan Kamath
39d7630234 am 3da645f3: Merge "Don\'t pseudolocalize untranslatable strings." 
* commit '3da645f307695949623d78f280ce12e932eb057c':
  Don't pseudolocalize untranslatable strings.
 2013-12-18 05:00:02 -08:00
Narayan Kamath
3da645f307 Merge "Don't pseudolocalize untranslatable strings." 2013-12-18 12:46:41 +00:00
Alan Viverette
217694199f Merge "Correctly report isOpaque() from ImageView" 2013-12-18 02:53:20 +00:00
Alan Viverette
92f33b0754 Merge "Peek the fast scroll thumb when it transitions to enabled state" 2013-12-18 02:44:32 +00:00
Alan Viverette
63567e3829 Merge "Ensure transient state views are consistently temporarily detached" 2013-12-18 02:31:40 +00:00