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

120864 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Cross
c1a7d0758d am 232d4224: am f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both" 
* commit '232d422405d686eb493b48370a2b2f7c35fe96fb':
  app_process: use LOCAL_MULTILIB := both
 2014-03-27 17:36:27 +00:00
Colin Cross
232d422405 am f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both" 
* commit 'f0ffa8a38e90f64912686833dba9823b251fae57':
  app_process: use LOCAL_MULTILIB := both
 2014-03-27 17:30:01 +00:00
Colin Cross
f0ffa8a38e Merge "app_process: use LOCAL_MULTILIB := both" 2014-03-27 17:26:08 +00:00
Colin Cross
f130f0aaea app_process: use LOCAL_MULTILIB := both 
Use LOCAL_MULTILIB := both to build app_process64 instead of
duplicating the build rule.

Also causes PRODUCT_PACKAGES := app_process to install both
versions on 64-bit platforms, as the module names for both
app_process and app_process64 are now app_process.

Change-Id: Ia3c3265d15475771b0cae8bace53b8fbf351c186
 2014-03-27 10:20:29 -07:00
Adam Lesinski
6984e4f9bb am fc680b89: Merge "Fix a race in NotificationManager with Listeners" into klp-modular-dev 
* commit 'fc680b89184fb60cf9a58e81d7f890002310702d':
  Fix a race in NotificationManager with Listeners
 2014-03-27 17:18:03 +00:00
Adam Lesinski
fc680b8918 Merge "Fix a race in NotificationManager with Listeners" into klp-modular-dev 2014-03-27 17:11:35 +00:00
Narayan Kamath
22d074643e resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aosp 
Change-Id: I871431e5a3ce45a33563ced845e044d37471689b
 2014-03-27 12:50:58 +00:00
Narayan Kamath
eaab4df0dd am cd3f60f3: Merge "AArch64: Make frameworks/base code more portable" 
* commit 'cd3f60f30366a34b4499aab5a47b622069ba9cd6':
  AArch64: Make frameworks/base code more portable
 2014-03-27 12:36:10 +00:00
Narayan Kamath
cd3f60f303 Merge "AArch64: Make frameworks/base code more portable" 2014-03-27 12:30:53 +00:00
Ashok Bhat
f5df700e6c AArch64: Make frameworks/base code more portable 
Changes in this patch include

[x] Use %zu for size_t, %zd for ssize_t

[x] Some minor changes have been done to conform with
    standard JNI practice (e.g. use of jint instead of int
    in JNI function prototypes)

Change-Id: Id1aaa7894a7d0b85ac7ecd7b2bfd8cc40374261f
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
 2014-03-27 12:30:42 +00:00
Scott Main
68d43e275e am b5e754dd: am 8ea583a7: am f9943d0e: Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs 
* commit 'b5e754dd4d8accd0c1500008aa1a6dbf178d33d7':
  add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29
 2014-03-27 09:31:08 +00:00
Scott Main
b5e754dd4d am 8ea583a7: am f9943d0e: Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs 
* commit '8ea583a71aef2f21f833c003a948ca7b1dc32915':
  add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29
 2014-03-27 09:24:46 +00:00
Scott Main
8ea583a71a am f9943d0e: Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs 
* commit 'f9943d0ecf4d3360064a4cec0b1ffd6767db5612':
  add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29
 2014-03-27 09:15:18 +00:00
Scott Main
f9943d0ecf Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs 2014-03-27 06:24:15 +00:00
Scott Main
ef17956363 am e0c66e73: am 74b821dc: am 09131844: add viewport width override to each landing page and fix link on homepage 
* commit 'e0c66e73b45f228a87086257a9aa7c13361f8b18':
  add viewport width override to each landing page and fix link on homepage
 2014-03-27 03:32:41 +00:00
Scott Main
e0c66e73b4 am 74b821dc: am 09131844: add viewport width override to each landing page and fix link on homepage 
* commit '74b821dce313307584b1abecc2fa8d4da826ff65':
  add viewport width override to each landing page and fix link on homepage
 2014-03-27 03:26:45 +00:00
Scott Main
74b821dce3 am 09131844: add viewport width override to each landing page and fix link on homepage 
* commit '0913184499e76996baf047ecbcbd2b79e2c92643':
  add viewport width override to each landing page and fix link on homepage
 2014-03-27 03:20:34 +00:00
Scott Main
0913184499 add viewport width override to each landing page and fix link on homepage 
Change-Id: I54cfd2e5a0f127d26644e126d41c5044729af9c5
 2014-03-26 20:10:34 -07:00
Scott Main
039d44114e add the JD docs for the Android Wear docs (delte the HTML versions) 
This depends on the following CL that makes this all work with template changes:
I848f442b3bc66ee2fb87db8200df370d13762d29

Change-Id: I6b17db774de6fa8be0bf944516a44ba73b10cabb
 2014-03-26 19:23:38 -07:00
Adam Lesinski
e824026554 Fix a race in NotificationManager with Listeners 
After being bound to, a NotificationListenerService could
make a call into NotificationManagerService before having been
added to the list of active services.

Bug: 13644375
Change-Id: I4ed920d165f46d009f91e28ca13c3926563cd110
 2014-03-26 17:52:54 -07:00
Kenny Root
1dc1d6b22d am 5b93685a: am 57f2764b: Merge "CertificateChainValidator: initialize TrustManagerFactory" 
* commit '5b93685af37d840e7ef6d415bcfe8a8a4c004032':
  CertificateChainValidator: initialize TrustManagerFactory
 2014-03-27 00:10:41 +00:00
Kenny Root
5b93685af3 am 57f2764b: Merge "CertificateChainValidator: initialize TrustManagerFactory" 
* commit '57f2764bf104b0fe7b5cd67ad5b2cae9bc8352ed':
  CertificateChainValidator: initialize TrustManagerFactory
 2014-03-26 23:59:11 +00:00
Ricardo Cervera
cddd3b151f am bb7bb60a: am e94b79d7: am c5b54aed: Merge "docs: Added info on using HTTPS for the Eclipse ADT update site" into klp-docs 
* commit 'bb7bb60a713f7c11ed23203318c50e2c0103b08d':
  docs: Added info on using HTTPS for the Eclipse ADT update site
 2014-03-26 23:12:22 +00:00
Ricardo Cervera
bb7bb60a71 am e94b79d7: am c5b54aed: Merge "docs: Added info on using HTTPS for the Eclipse ADT update site" into klp-docs 
* commit 'e94b79d7037336f939ae3bc64a17df245b254e17':
  docs: Added info on using HTTPS for the Eclipse ADT update site
 2014-03-26 23:06:10 +00:00
Ricardo Cervera
e94b79d703 am c5b54aed: Merge "docs: Added info on using HTTPS for the Eclipse ADT update site" into klp-docs 
* commit 'c5b54aed1772de65d3f799e3fb6644ec1b791130':
  docs: Added info on using HTTPS for the Eclipse ADT update site
 2014-03-26 22:59:15 +00:00
Ricardo Cervera
c5b54aed17 Merge "docs: Added info on using HTTPS for the Eclipse ADT update site" into klp-docs 2014-03-26 22:54:02 +00:00
Kenny Root
57f2764bf1 Merge "CertificateChainValidator: initialize TrustManagerFactory" 2014-03-26 22:51:52 +00:00
Scott Main
e5ec1544f1 am 6bbfa5b5: am 2556034b: am 322cf5c4: fix image sizes in design guide and code snippet bug bug: 13644390 bug: 13626796 
* commit '6bbfa5b5b8174dab29f0b6b4b5473e1351f631f5':
  fix image sizes in design guide and code snippet bug bug: 13644390 bug: 13626796
 2014-03-26 22:50:44 +00:00
Scott Main
6bbfa5b5b8 am 2556034b: am 322cf5c4: fix image sizes in design guide and code snippet bug bug: 13644390 bug: 13626796 
* commit '2556034b61287a719d919e63bc1925d86651016a':
  fix image sizes in design guide and code snippet bug bug: 13644390 bug: 13626796
 2014-03-26 22:43:55 +00:00
Scott Main
2556034b61 am 322cf5c4: fix image sizes in design guide and code snippet bug bug: 13644390 bug: 13626796 
* commit '322cf5c44f3e1329f51014ec3fa45f1c322d3d37':
  fix image sizes in design guide and code snippet bug bug: 13644390 bug: 13626796
 2014-03-26 22:36:55 +00:00
Ricardo Cervera
1da618761f docs: Added info on using HTTPS for the Eclipse ADT update site 
Change-Id: Ia784ef37ef8a520183587ee696ec8f8541dbf441
 2014-03-26 15:33:44 -07:00
Scott Main
322cf5c44f fix image sizes in design guide and code snippet bug 
bug: 13644390
bug: 13626796

Change-Id: Ie5bb42c78190da6b6306c6ef6cc715a1ea33ffaa
 2014-03-26 15:26:50 -07:00
quddusc
52f6988b23 am fd95bffc: am ffba20b0: am d43c1300: docs: Fixed url to point to Google Analytics v4 Getting Started guide. 
* commit 'fd95bffc8b9399db8399c96cebb95d5bad3847a8':
  docs: Fixed url to point to Google Analytics v4 Getting Started guide.
 2014-03-26 21:29:27 +00:00
quddusc
fd95bffc8b am ffba20b0: am d43c1300: docs: Fixed url to point to Google Analytics v4 Getting Started guide. 
* commit 'ffba20b058a556dd2d0224bcdedf0dcdb0f222ca':
  docs: Fixed url to point to Google Analytics v4 Getting Started guide.
 2014-03-26 21:23:26 +00:00
quddusc
ffba20b058 am d43c1300: docs: Fixed url to point to Google Analytics v4 Getting Started guide. 
* commit 'd43c13009cb9e5e9abb430390e7da302335651e1':
  docs: Fixed url to point to Google Analytics v4 Getting Started guide.
 2014-03-26 21:16:37 +00:00
quddusc
d43c13009c docs: Fixed url to point to Google Analytics v4 Getting Started guide. 
Change-Id: I4be35af686fcf3613f391c0c886728e5c19f22e6
 2014-03-26 13:53:41 -07:00
Mark Salyzyn
959bce3e69 am 4e3abafc: am 5daf51c0: Merge "jni: 64-bit compile issue" 
* commit '4e3abafc9400eed38a1e76897b79e923acfaf8ed':
  jni: 64-bit compile issue
 2014-03-26 20:00:13 +00:00
Mark Salyzyn
4e3abafc94 am 5daf51c0: Merge "jni: 64-bit compile issue" 
* commit '5daf51c0fe6d5bea858c37291fed88bd3094d3ec':
  jni: 64-bit compile issue
 2014-03-26 12:56:02 -07:00
Ricardo Cervera
39d1b3f0b8 am a8d12f76: am 19a67a71: Merge "docs: Added release notes for Support Library 19.1.0" into klp-ub-dev 
* commit 'a8d12f764ccf85da52b82d6726c4a2a12c475fcf':
  docs: Added release notes for Support Library 19.1.0
 2014-03-26 19:53:28 +00:00
Mark Salyzyn
5daf51c0fe Merge "jni: 64-bit compile issue" 2014-03-26 19:52:11 +00:00
Ricardo Cervera
a8d12f764c am 19a67a71: Merge "docs: Added release notes for Support Library 19.1.0" into klp-ub-dev 
* commit '19a67a71d0105bb27472e26e5f5e0c8ef3a71dfd':
  docs: Added release notes for Support Library 19.1.0
 2014-03-26 19:47:38 +00:00
Ricardo Cervera
19a67a71d0 Merge "docs: Added release notes for Support Library 19.1.0" into klp-ub-dev 2014-03-26 19:41:04 +00:00
Mark Salyzyn
aeb75fc5a3 jni: 64-bit compile issue 
- switch to PRId64
- some unused parameter warning suppression

Change-Id: Ia36bd1a247bb6e866a6b1050ab1362ebc9d31786
 2014-03-26 11:28:45 -07:00
Ricardo Cervera
5d005ba9a7 am 3d093ea6: am e59a2665: am 1b59f291: Merge "docs: Added Android Studio build system doc." into klp-docs 
* commit '3d093ea69a488e4afd982a59273f0bf8c3474b5a':
  docs: Added Android Studio build system doc.
 2014-03-26 18:23:10 +00:00
Ricardo Cervera
3d093ea69a am e59a2665: am 1b59f291: Merge "docs: Added Android Studio build system doc." into klp-docs 
* commit 'e59a26650afbc664aeda08f7e69c2d135631c34d':
  docs: Added Android Studio build system doc.
 2014-03-26 18:16:35 +00:00
Ricardo Cervera
e59a26650a am 1b59f291: Merge "docs: Added Android Studio build system doc." into klp-docs 
* commit '1b59f291573deb4c1d6f60035637a3c49e671ab4':
  docs: Added Android Studio build system doc.
 2014-03-26 18:11:33 +00:00
Ricardo Cervera
1b59f29157 Merge "docs: Added Android Studio build system doc." into klp-docs 2014-03-26 18:06:51 +00:00
Nick Kralevich
32cc40a9b5 am fdd63510: am 491eaf22: Merge "Note libselinux dependency on packages.list format changes." 
* commit 'fdd6351067740f80148ff03c43d2ebc91f1d9656':
  Note libselinux dependency on packages.list format changes.
 2014-03-26 15:55:41 +00:00
Nick Kralevich
fdd6351067 am 491eaf22: Merge "Note libselinux dependency on packages.list format changes." 
* commit '491eaf2255a95186e84092eae4ec43582eebb37b':
  Note libselinux dependency on packages.list format changes.
 2014-03-26 08:47:39 -07:00
Nick Kralevich
491eaf2255 Merge "Note libselinux dependency on packages.list format changes." 2014-03-26 15:41:14 +00:00