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

146729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
ccc00a3002 am cea9bbd5: Ensure the ResTable data is at least the size of a ResTable_header 
* commit 'cea9bbd5b854acaad298329ad2c038ad39f4357f':
  Ensure the ResTable data is at least the size of a ResTable_header
 2014-07-29 17:48:13 +00:00
Adam Lesinski
e9573a1b1c am 6d88070e: am 2420fb3e: Merge "Have AEP GL feature depend on GLES 3.1 in badging" into lmp-dev 
* commit '6d88070e23d077e78b158dc754e6424e416ebb18':
  Have AEP GL feature depend on GLES 3.1 in badging
 2014-07-29 17:44:14 +00:00
Alan Viverette
15b564fcd4 am 491edeb4: Merge "Don\'t double-cancel the active ripple" into lmp-dev 
* commit '491edeb443021b04bd8125fc391941caf28a58b0':
  Don't double-cancel the active ripple
 2014-07-29 17:44:08 +00:00
Alan Viverette
75a79a467f am 936ee391: Merge "Add better errors for unresolved attributes, remove unused code" into lmp-dev 
* commit '936ee391d1e776f16be7cf3b9f981e5e0978efb2':
  Add better errors for unresolved attributes, remove unused code
 2014-07-29 17:44:03 +00:00
Adam Lesinski
f28d505dc5 Ensure the ResTable data is at least the size of a ResTable_header 
Change-Id: Ib8d5574bd6a125797a582837987332e66721e84d
 2014-07-29 17:42:34 +00:00
Adam Lesinski
64c81f72a1 am 2420fb3e: Merge "Have AEP GL feature depend on GLES 3.1 in badging" into lmp-dev 
* commit '2420fb3e9dab2b57a4c7028f922073b779dd857d':
  Have AEP GL feature depend on GLES 3.1 in badging
 2014-07-29 17:39:54 +00:00
John Reck
29620f7e52 am b0aa6f68: am 4be69bc5: Merge "Add layer/texture creation tracing" into lmp-dev 
* commit 'b0aa6f68bb7494a0f2a3c3695579502ecb144bf2':
  Add layer/texture creation tracing
 2014-07-29 17:28:46 +00:00
John Reck
a0d86abce1 am 4be69bc5: Merge "Add layer/texture creation tracing" into lmp-dev 
* commit '4be69bc56c4b9a7f9d197704c743e895daf1b183':
  Add layer/texture creation tracing
 2014-07-29 17:24:30 +00:00
Eric Laurent
f28f7b7ab5 am d096b6a2: am 85ff12e3: Merge "Fix capitalization on AudioPort callback method names" into lmp-dev 
* commit 'd096b6a27ba32296827c825cf8cbf546541c4cd3':
  Fix capitalization on AudioPort callback method names
 2014-07-29 17:20:55 +00:00
Eric Laurent
9dd773e010 am 85ff12e3: Merge "Fix capitalization on AudioPort callback method names" into lmp-dev 
* commit '85ff12e32cf5976e21a5a4939ca59ccbc650b171':
  Fix capitalization on AudioPort callback method names
 2014-07-29 17:16:40 +00:00
Yorke Lee
056fdb23a2 am 192e093c: am fc19eaa5: Merge "Add new proximity sensors in Telecomm (1/3)" into lmp-dev 
* commit '192e093c43e45d9195921df3ea9f4d843da147a0':
  Add new proximity sensors in Telecomm (1/3)
 2014-07-29 17:03:33 +00:00
Robert Ly
759a146b30 am e163d4b4: am 46aab982: am 9c53194a: am 58967bfb: am 1c977b37: Merge "docs: fix typo bug 16623189" into klp-modular-docs 
* commit 'e163d4b4f85f0e2ccc769009c0a3cb50acf0c89e':
  docs: fix typo bug 16623189
 2014-07-29 16:58:33 +00:00
Yorke Lee
dd4f5be0ad am fc19eaa5: Merge "Add new proximity sensors in Telecomm (1/3)" into lmp-dev 
* commit 'fc19eaa58f3e32d590018aeeb827754e385ac597':
  Add new proximity sensors in Telecomm (1/3)
 2014-07-29 16:58:30 +00:00
Robert Ly
a5ccd086aa am c70a4a41: am c83bb478: am 0029ef67: am dadb473e: am 9613b433: Merge "docs: fix typo" into klp-modular-docs 
* commit 'c70a4a416f385803f071569987e5a83c1e01e51c':
  docs: fix typo
 2014-07-29 16:58:29 +00:00
Ricardo Cervera
8cfef0a3cf am 9eac03fa: am 6230a0d6: am 7f214e61: am 8d1aa957: am 652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs 
* commit '9eac03fa269d6c8dc7d071cd3a3b2a9db7245c7f':
  docs: Describe the alloc tracker in Android Studio
 2014-07-29 16:58:25 +00:00
Ricardo Cervera
6fd26f47b7 am 47aba1f1: am 4a8b7fd4: am 5ff390be: am df881ccc: am 321e0302: docs: Fix Wear docs issues. 
* commit '47aba1f14b472ff1deb00f37d9f882c02adb5e09':
  docs: Fix Wear docs issues.
 2014-07-29 16:58:20 +00:00
Robert Ly
f027a5f1fb am 46aab982: am 9c53194a: am 58967bfb: am 1c977b37: Merge "docs: fix typo bug 16623189" into klp-modular-docs 
* commit '46aab98279cc590448281426b06de8e1b71b6b8f':
  docs: fix typo bug 16623189
 2014-07-29 16:53:47 +00:00
Robert Ly
2f372872e8 am c83bb478: am 0029ef67: am dadb473e: am 9613b433: Merge "docs: fix typo" into klp-modular-docs 
* commit 'c83bb47843b17470fc2ca452d4571327749d26c1':
  docs: fix typo
 2014-07-29 16:53:42 +00:00
Ricardo Cervera
23f80650af am 6230a0d6: am 7f214e61: am 8d1aa957: am 652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs 
* commit '6230a0d68e4dcd53a588925634cfc7ccd018f30f':
  docs: Describe the alloc tracker in Android Studio
 2014-07-29 16:53:38 +00:00
Ricardo Cervera
4edcd731d0 am 4a8b7fd4: am 5ff390be: am df881ccc: am 321e0302: docs: Fix Wear docs issues. 
* commit '4a8b7fd488d8563f224615d19c491bcca374f665':
  docs: Fix Wear docs issues.
 2014-07-29 16:53:33 +00:00
Robert Ly
7043ce4a8c am 9c53194a: am 58967bfb: am 1c977b37: Merge "docs: fix typo bug 16623189" into klp-modular-docs 
* commit '9c53194a6fccd9980d4ee3fabe4466b16d73580b':
  docs: fix typo bug 16623189
 2014-07-29 16:48:33 +00:00
Robert Ly
c7af515f91 am 0029ef67: am dadb473e: am 9613b433: Merge "docs: fix typo" into klp-modular-docs 
* commit '0029ef67598336e3a774c6cf1dfde8245136484a':
  docs: fix typo
 2014-07-29 16:48:17 +00:00
Ricardo Cervera
9ce46bc1cc am 7f214e61: am 8d1aa957: am 652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs 
* commit '7f214e6149b38af10224cf9f8f8f4959eebd52a6':
  docs: Describe the alloc tracker in Android Studio
 2014-07-29 16:48:11 +00:00
Ricardo Cervera
6d327429bb am 5ff390be: am df881ccc: am 321e0302: docs: Fix Wear docs issues. 
* commit '5ff390be1b0b968ccf28e693b602b8e8b5f448e9':
  docs: Fix Wear docs issues.
 2014-07-29 16:48:01 +00:00
Robert Greenwalt
9a140a5ca6 am 1ebacdcf: am 5ebb2396: Remove dead code 4. 
* commit '1ebacdcfa805ea6936a453f5db688d76832ee22a':
  Remove dead code 4.
 2014-07-29 16:40:35 +00:00
Robert Greenwalt
34032d360e am 5ebb2396: Remove dead code 4. 
* commit '5ebb2396130e5f987e629c2a631c0dcb3a592a6e':
  Remove dead code 4.
 2014-07-29 16:37:10 +00:00
Robert Ly
9c53194a6f am 58967bfb: am 1c977b37: Merge "docs: fix typo bug 16623189" into klp-modular-docs 
* commit '58967bfbe824f020194872a6d0a5204b54e6043a':
  docs: fix typo bug 16623189
 2014-07-29 16:34:01 +00:00
Robert Greenwalt
5c1c832a8f Remove dead code 4. 
Removing:
handleDnsConfigurationChange
updateDnsLocked
updateRoutes
handleConnectivityChange
handleConnect
handleDisconnect

Adding a missing flushVmDnsCache and setting of mActiveDefaultNetwork

Change-Id: I681fc72c317833ea1deb42db0b43d2adb21baeff
 2014-07-29 16:32:08 +00:00
Robert Ly
58967bfbe8 am 1c977b37: Merge "docs: fix typo bug 16623189" into klp-modular-docs 
* commit '1c977b3744dbe916edde2e256a39c30e5888ef4f':
  docs: fix typo bug 16623189
 2014-07-29 16:30:07 +00:00
RoboErik
6b9eb65ea0 am 31eefb04: am 14f99c15: Fix checkbuild 
* commit '31eefb04a0feefe831fc9cc3d8c7ccb2d7fe1614':
  Fix checkbuild
 2014-07-29 15:59:19 +00:00
RoboErik
2a8388c424 am 14f99c15: Fix checkbuild 
* commit '14f99c1557d84a87fa8bbe2a433a77e74e6316b2':
  Fix checkbuild
 2014-07-29 15:55:36 +00:00
RoboErik
40495e0545 Fix checkbuild 
Change-Id: I66321c6da4f921cee2db6f9f05312a6a8edc66d3
 2014-07-29 15:51:07 +00:00
Robert Ly
0029ef6759 am dadb473e: am 9613b433: Merge "docs: fix typo" into klp-modular-docs 
* commit 'dadb473e2b9dc7bf2691dea7153c6700102e6562':
  docs: fix typo
 2014-07-29 15:42:24 +00:00
Robert Ly
dadb473e2b am 9613b433: Merge "docs: fix typo" into klp-modular-docs 
* commit '9613b433f47162d008f034afbb16deac16532662':
  docs: fix typo
 2014-07-29 15:38:02 +00:00
Ricardo Cervera
7f214e6149 am 8d1aa957: am 652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs 
* commit '8d1aa95729a44a953dd5cd434f2c7380e6d1f641':
  docs: Describe the alloc tracker in Android Studio
 2014-07-29 15:32:57 +00:00
Alexandra Gherghina
46ddabd8f9 am d88cc4ae: am 28e894b5: Rename work icon symbol to match the prefix used for badges. 
* commit 'd88cc4aee537ae32e2281c277be159eebbf42e25':
  Rename work icon symbol to match the prefix used for badges.
 2014-07-29 15:31:51 +00:00
Ricardo Cervera
8d1aa95729 am 652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs 
* commit '652e5c7ef1f8176dc680f7c4ba782164269b03b0':
  docs: Describe the alloc tracker in Android Studio
 2014-07-29 15:29:00 +00:00
Alexandra Gherghina
10ff532a6e am 28e894b5: Rename work icon symbol to match the prefix used for badges. 
* commit '28e894b5e4bf90b99494c151a4ce5875c300b808':
  Rename work icon symbol to match the prefix used for badges.
 2014-07-29 15:27:17 +00:00
Alexandra Gherghina
1f33d77f04 Rename work icon symbol to match the prefix used for badges. 
Also renames the images for consistency.

Bug: 16369104
Change-Id: I19f97ae22cb2ee4f7db210f083badc1a30520b44
 2014-07-29 15:21:01 +00:00
Ricardo Cervera
5ff390be1b am df881ccc: am 321e0302: docs: Fix Wear docs issues. 
* commit 'df881ccc1fe5efefa4a71cf8e5f663f9e2911151':
  docs: Fix Wear docs issues.
 2014-07-29 15:07:56 +00:00
George Mount
8dc37f0b49 am 21ad6298: am b8c728f3: Merge "Allow a "ghost view" that paint a different view from the overlay." into lmp-dev 
* commit '21ad629806213aff7e51bd44cabcbcdb6fbbb49c':
  Allow a "ghost view" that paint a different view from the overlay.
 2014-07-29 15:07:53 +00:00
George Mount
c9e21c1179 am b8c728f3: Merge "Allow a "ghost view" that paint a different view from the overlay." into lmp-dev 
* commit 'b8c728f3c62306334f40a559006a41134da8a223':
  Allow a "ghost view" that paint a different view from the overlay.
 2014-07-29 15:03:21 +00:00
Ricardo Cervera
df881ccc1f am 321e0302: docs: Fix Wear docs issues. 
* commit '321e030202cb74cad0dd8a4950cffe361a5072c8':
  docs: Fix Wear docs issues.
 2014-07-29 15:01:11 +00:00
Marcin Kosiba
67c9d2df66 am 3a05cd85: am 6613e92c: Make webview text encoding and keySystemUUID mapping and error page public. 
* commit '3a05cd855ce5d98c5ed827df5799e92447de7008':
  Make webview text encoding and keySystemUUID mapping and error page public.
 2014-07-29 14:27:44 +00:00
Lorenzo Colitti
e7599b03b2 am bd98af17: am 9da11341: Merge "Use getBoundURL for network validation." into lmp-dev 
* commit 'bd98af173ded9f5d486f79d7e5c59e08f363d0fb':
  Use getBoundURL for network validation.
 2014-07-29 14:23:10 +00:00
George Mount
f0572bb131 am 610c6e42: am 3356ef9d: Add default propagation back to Explode. 
* commit '610c6e42f23bc0f409729bc38e7e1d56928cf1aa':
  Add default propagation back to Explode.
 2014-07-29 14:23:05 +00:00
Marcin Kosiba
e4251e7aa7 am 6613e92c: Make webview text encoding and keySystemUUID mapping and error page public. 
* commit '6613e92caf4233a27f91267da5a9c06366b1cdcd':
  Make webview text encoding and keySystemUUID mapping and error page public.
 2014-07-29 14:22:01 +00:00
Lorenzo Colitti
0868f1c112 am 9da11341: Merge "Use getBoundURL for network validation." into lmp-dev 
* commit '9da1134167b117ae3d26ee4dcbf154b1f64fbcea':
  Use getBoundURL for network validation.
 2014-07-29 14:17:14 +00:00
George Mount
5280bed8ab am 3356ef9d: Add default propagation back to Explode. 
* commit '3356ef9d0a4f7ebde7d0acbbb4f09658bc63e4cb':
  Add default propagation back to Explode.
 2014-07-29 14:17:09 +00:00
Marcin Kosiba
eed396f792 Make webview text encoding and keySystemUUID mapping and error page public. 
These resources will need to be accessed from the APK-bundled
WebView and therefore need to be made public.

BUG: 11505352
Change-Id: I5e988671cc8342ed4146a90b4de1246460232050
 2014-07-29 15:17:07 +01:00