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

185607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Miao Wang
919b6475d3 [RenderScript] Remove duplicate include in jni 
Change-Id: Ib6019ab22a83d952dce3fd6f5351120d94b49d58
 2015-03-18 19:16:47 -07:00
Mathieu Chartier
1fb7aab9b2 Revert "Change jit properties to be debug properties" 
Bug: 19735273

This reverts commit 1ad10ef1e4b83ef9e845761a82e202bb57e2379d.

Change-Id: Iac930925ab6d5cd5947fa4077c8d93e2984927d5
 2015-03-18 19:07:02 -07:00
Andrew Solovay
73f222556b am d28452bb: am 429f894a: am ae1cf011: am b08f2078: am 3f7f78c6: am 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs 
* commit 'd28452bb9c7af6abd857de51e640c0c3ea76650e':
  docs: Removed sentence fragments.
 2015-03-19 01:58:50 +00:00
Andrew Solovay
86493af4b9 am 6bb34ef5: am 93ffb863: am b489a6d1: am cf34a6d1: am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 
* commit '6bb34ef53860de39e143848752600f4c91415376':
  docs: Fixed typo (spurious quotation mark).
 2015-03-19 01:58:42 +00:00
Andrew Solovay
f18a0b1f89 am 164dd96e: am 11891570: am 006d7512: am a0141748: am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 
* commit '164dd96eec5369652594c560e076bcf12e6416f7':
  docs: Fixed broken image link, and broke long lines in code samples
 2015-03-19 01:57:28 +00:00
Alan Viverette
eef3bcbbe4 Merge "Replace usages of deprecated Resources.getColor() and getColorStateList()" 2015-03-19 01:54:09 +00:00
Andrew Solovay
d28452bb9c am 429f894a: am ae1cf011: am b08f2078: am 3f7f78c6: am 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs 
* commit '429f894a70840c9debcb2a2730bde2e0b34eb324':
  docs: Removed sentence fragments.
 2015-03-19 01:49:11 +00:00
Andrew Solovay
6bb34ef538 am 93ffb863: am b489a6d1: am cf34a6d1: am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 
* commit '93ffb8633751c398b79ac894f741a0b745b3fc3d':
  docs: Fixed typo (spurious quotation mark).
 2015-03-19 01:49:05 +00:00
Andrew Solovay
164dd96eec am 11891570: am 006d7512: am a0141748: am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 
* commit '118915706ea9f52e503bc82bf616da438eaad65e':
  docs: Fixed broken image link, and broke long lines in code samples
 2015-03-19 01:49:00 +00:00
Andrew Solovay
429f894a70 am ae1cf011: am b08f2078: am 3f7f78c6: am 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs 
* commit 'ae1cf011b4c168e3ebce101a29867aab7c658a3a':
  docs: Removed sentence fragments.
 2015-03-19 01:42:56 +00:00
Andrew Solovay
93ffb86337 am b489a6d1: am cf34a6d1: am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 
* commit 'b489a6d14fbc3f7e7cf1eb0c224da1078a59f23b':
  docs: Fixed typo (spurious quotation mark).
 2015-03-19 01:42:52 +00:00
Andrew Solovay
118915706e am 006d7512: am a0141748: am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 
* commit '006d751215ca601952a1b52f9b54c3750f4903da':
  docs: Fixed broken image link, and broke long lines in code samples
 2015-03-19 01:42:48 +00:00
Alan Viverette
4a357cd2e5 Replace usages of deprecated Resources.getColor() and getColorStateList() 
Change-Id: I8f64fe6c4c44a92ff6d07250223ba590a1d691b0
 2015-03-18 18:37:18 -07:00
Andrew Solovay
ae1cf011b4 am b08f2078: am 3f7f78c6: am 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs 
* commit 'b08f20787c793c79d2031a34824dbfa5be4a602c':
  docs: Removed sentence fragments.
 2015-03-19 01:26:09 +00:00
Andrew Solovay
b489a6d14f am cf34a6d1: am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 
* commit 'cf34a6d1a19853fe156bf14abcb40a01a380de79':
  docs: Fixed typo (spurious quotation mark).
 2015-03-19 01:26:04 +00:00
Andrew Solovay
006d751215 am a0141748: am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 
* commit 'a01417485279a486df31f8666b037b6f15d7f935':
  docs: Fixed broken image link, and broke long lines in code samples
 2015-03-19 01:25:57 +00:00
Chris Craik
f9eb4b90fe Merge "Use glops for text rendering" 2015-03-19 01:02:25 +00:00
Andrew Solovay
b08f20787c am 3f7f78c6: am 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs 
* commit '3f7f78c6518f93b694bd868d406c755e2469584c':
  docs: Removed sentence fragments.
 2015-03-19 00:55:12 +00:00
Andrew Solovay
cf34a6d1a1 am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 
* commit '46bda6a4838e592fd3cc0d9334ae92cdc7434f3e':
  docs: Fixed typo (spurious quotation mark).
 2015-03-19 00:55:08 +00:00
Andrew Solovay
a014174852 am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 
* commit '42f966c9df6ed4e7903e87ad557d63ed81da2986':
  docs: Fixed broken image link, and broke long lines in code samples
 2015-03-19 00:55:01 +00:00
Shawn Willden
29a5a5b654 am 1bed39a5: am e921b8a2: Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE." 
* commit '1bed39a5e4d57e4735e72a1e9765dcec62035b40':
  Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE.
 2015-03-19 00:48:02 +00:00
Shawn Willden
98be580dbb am 615f39f9: am 254c58c4: Merge changes Id9a22ad3,I629ab2c4 
* commit '615f39f911cdc4201b4e1c63c79ae1819a6645ea':
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.
 2015-03-19 00:47:54 +00:00
Shawn Willden
1bed39a5e4 am e921b8a2: Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE." 
* commit 'e921b8a28f0d5b69fbb30374241c62fa90e92013':
  Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE.
 2015-03-19 00:42:09 +00:00
Shawn Willden
615f39f911 am 254c58c4: Merge changes Id9a22ad3,I629ab2c4 
* commit '254c58c4e760e0af132d680fbd783a38ef436435':
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.
 2015-03-19 00:41:58 +00:00
Bryce Lee
d8379b907f am 8b8a0451: am 8bc23e82: Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev 
* commit '8b8a045133e0466e964b4094269585708805b90a':
  Add Assist global action for wear to different from VOICE_ASSIST
 2015-03-19 00:32:17 +00:00
Shawn Willden
e921b8a28f Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE." 2015-03-19 00:30:30 +00:00
Shawn Willden
e90774ddbc Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE. 
Also change to an ENUM, to match changes in keymaster_defs.h

Change-Id: Ieda3402563b0b9e4e8b100eb69a94651e51c6347
 2015-03-18 18:28:39 -06:00
Alan Viverette
4a4be5d93a Merge "Clean up ripple exit, null out software animators on cancel/end" 2015-03-19 00:27:45 +00:00
Shawn Willden
254c58c4e7 Merge changes Id9a22ad3,I629ab2c4 
* changes:
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.
 2015-03-19 00:27:38 +00:00
Alan Viverette
fc8882f134 Clean up ripple exit, null out software animators on cancel/end 
Bug: 19682421
Change-Id: I40ff56ed98a6c67cd01c74e455899825013a1f12
 2015-03-18 17:26:54 -07:00
Bryce Lee
8b8a045133 am 8bc23e82: Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev 
* commit '8bc23e82af040334af4f2af1dae9898cc8c66df8':
  Add Assist global action for wear to different from VOICE_ASSIST
 2015-03-19 00:21:13 +00:00
Dongwon Kang
28299099db Merge "TIF: Add COLUMN_INTERNAL_PROVIDER_FLAGX to TvContract" 2015-03-19 00:20:14 +00:00
Dongwon Kang
10c6e230bc Merge "TIF: Add TvInputInfo.isHardwareInput()." 2015-03-19 00:18:44 +00:00
Bryce Lee
8bc23e82af Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev 2015-03-19 00:14:07 +00:00
Clara Bayarri
6820434edd Merge "Editor: Avoid the paste popup from coming up when a word is selected." 2015-03-19 00:04:37 +00:00
Jason Sams
e16da12b7b Make it harder to leak contexts 
Change-Id: Ied60b6428bedb200d7b5b627e8196fbf2b4151e1
 2015-03-18 17:04:18 -07:00
Nick Vaccaro
9504a9d90b am 23c7cef2: am 74a0eb36: Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev 
* commit '23c7cef2ca28bf3116611507457be953f45ca80b':
  Avoid unhandled page fault cases on Android Wear
 2015-03-19 00:01:15 +00:00
Joe Fernandez
cdf130800b am ed657981: am 59d6c8bd: Merge "cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819" into lmp-docs 
* commit 'ed6579811f466db1e5e4058508c71e412472e71e':
  cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819
 2015-03-18 23:54:30 +00:00
Joe Fernandez
e31c904831 am 462dc7b9: am cb92819f: Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs 
* commit '462dc7b9ca508a6f61bb8dd494b67aa0d80eb57e':
  docs: Add distribution guidelines and update quality checklist for Android Auto.
 2015-03-18 23:54:22 +00:00
Eric Gilmore
f1598d1852 Changes for a quick, pre-migration bug sprint: 
Bug: 19679070, 19716684, 19680472.
Change-Id: I14ba1cf53ea42cd7739793fd9873e40e4a2ee6a0
 2015-03-18 16:53:47 -07:00
Mathieu Chartier
75f1ba5a81 am f792e016: am 437ac8f8: Merge "Add JIT late override property" 
* commit 'f792e01606b988ab84190217529cca53da8db3f5':
  Add JIT late override property
 2015-03-18 23:51:12 +00:00
Bart Sears
8b1c27c5ab am f5353e9d: am 91281bbd: resolved conflicts for merge of cc86bc0c to lmp-mr1-modular-dev 
* commit 'f5353e9dda15fe49023083ec7ca2131feed7787d':
  Prevent activities from being started during setup wizard.
 2015-03-18 23:51:02 +00:00
Andreas Gampe
27f2fe5c1a am b078ff16: am 13dbc3d4: Merge "Frameworks/base: Fix potential NPE in InputMethod" 
* commit 'b078ff16a3ea83f7e4f444eb7b7b699ee8e913a6':
  Frameworks/base: Fix potential NPE in InputMethod
 2015-03-18 23:50:54 +00:00
Andreas Gampe
e09a941585 am 4f0a96d2: am 9cc36ac2: Merge "Frameworks/base: Remove duplicate check in Mesh" 
* commit '4f0a96d2d923bd1f4c7f46ec25c83711565b77db':
  Frameworks/base: Remove duplicate check in Mesh
 2015-03-18 23:50:47 +00:00
Andreas Gampe
870c4ba78a am 1eca7d66: am 2a247b36: Merge "Frameworks/base: Fix visibility flag in Editor" 
* commit '1eca7d66ee3da87c622259544794b8fe998cdb92':
  Frameworks/base: Fix visibility flag in Editor
 2015-03-18 23:50:35 +00:00
Andreas Gampe
3c4ca688ce am 1dae2f93: am 8df1bedc: Merge "Frameworks/base: Fix potential NPE in Script" 
* commit '1dae2f9341c05eee5d77489c579ffd621fbe108b':
  Frameworks/base: Fix potential NPE in Script
 2015-03-18 23:50:25 +00:00
Mark Salyzyn
2d5b2c7dc1 am 6a9cd7b0: am e2c8e504: Merge "logd: optimize statistics" 
* commit '6a9cd7b0d4215d9e20ed59e6ab0c328c81cd842b':
  logd: optimize statistics
 2015-03-18 23:49:08 +00:00
Jason Sams
68af9a9904 am b533f3e1: am 1aadd347: Merge "Avoid duplicate surface creation." 
* commit 'b533f3e1ad098b38070369609e6b1892828bc111':
  Avoid duplicate surface creation.
 2015-03-18 23:48:52 +00:00
Dan Sandler
61bc9d535b am b509a809: am fbd99e9f: am 76620791: am b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev 
* commit 'b509a809b20d1eae76613b43a93059c32c4a8435':
  Avoid crashing on corrupted notifications.
 2015-03-18 23:48:31 +00:00
Joe Fernandez
ed6579811f am 59d6c8bd: Merge "cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819" into lmp-docs 
* commit '59d6c8bdaf6428f10d0c8bf144de7c39848ed868':
  cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819
 2015-03-18 23:47:26 +00:00