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

13610 Commits

Author SHA1 Message Date
Dan Sandler
eef3fbcf68 am 8deb6d95: am e6a4b445: am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev 
* commit '8deb6d95a73d5d6860fbfb2eb273cdbc49c5d2c9':
  Avoid crashing on startup when policy forbids lockscreen camera.
 2015-03-06 00:31:04 +00:00
Dan Sandler
8deb6d95a7 am e6a4b445: am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev 
* commit 'e6a4b445944489d67d40c8f52322fb149290fcf8':
  Avoid crashing on startup when policy forbids lockscreen camera.
 2015-03-06 00:21:47 +00:00
Dan Sandler
e6a4b44594 am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev 
* commit '3581f4c91a77ecb9313f51a2d07ed88ff61d9299':
  Avoid crashing on startup when policy forbids lockscreen camera.
 2015-03-06 00:10:22 +00:00
Dan Sandler
3581f4c91a Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev 2015-03-06 00:03:37 +00:00
John Spurlock
3bedeb0101 am bd438742: am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE. 
* commit 'bd438742870a51eacea3554376f671bd1be0e30c':
  MediaProjectionPermissionActivity: Fix NPE.
 2015-03-04 23:15:51 +00:00
John Spurlock
bd43874287 am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE. 
* commit 'b879e7395fa9446952b840b1d576ff225b039774':
  MediaProjectionPermissionActivity: Fix NPE.
 2015-03-04 23:09:19 +00:00
John Spurlock
b879e7395f am c974ac11: MediaProjectionPermissionActivity: Fix NPE. 
* commit 'c974ac11f808968648d26e83a0b64a7fba02ad15':
  MediaProjectionPermissionActivity: Fix NPE.
 2015-03-04 23:01:26 +00:00
John Spurlock
c974ac11f8 MediaProjectionPermissionActivity: Fix NPE. 
Avoid dismissing a null dialog.

Bug: 19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
(cherry picked from commit 3d332f4e67a484abe597576bf329d89655afe720)
 2015-03-04 18:58:18 +00:00
Geoff Mendal
3b9e64f326 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-03-04 14:04:04 +00:00
Geoff Mendal
c70510298e Import translations. DO NOT MERGE 
Change-Id: I50787822a2df02ff61bfe4f7402b96dcd2cd43a7
Auto-generated-cl: translation import
 2015-03-04 06:02:36 -08:00
Geoff Mendal
63069cc985 Import translations. DO NOT MERGE 
Change-Id: If2c19af2e0b45fec9a0486eedbe51d7fe8bdf426
Auto-generated-cl: translation import
 2015-03-04 05:56:33 -08:00
Geoff Mendal
42796e97f6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-03-04 13:41:22 +00:00
Geoff Mendal
302132c379 Import translations. DO NOT MERGE 
Change-Id: Ifb9b4ef49d9e590dc0e37eb3f91b5ae6ad0ba693
Auto-generated-cl: translation import
 2015-03-04 05:35:11 -08:00
Geoff Mendal
cba2873edc Import translations. DO NOT MERGE 
Change-Id: I253641b732a51a58cbabaa6b487e37f5eda69e2b
Auto-generated-cl: translation import
 2015-03-04 05:29:01 -08:00
Dan Sandler
e163a645dd Avoid crashing on startup when policy forbids lockscreen camera. 
Bug: 19554426
Change-Id: I5b2898d7d114de87d925b5eccc8e4b189e4713de
 2015-03-03 16:06:28 -05:00
Geoff Mendal
fe78077418 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-03-02 14:18:15 +00:00
Geoff Mendal
341b04711d Import translations. DO NOT MERGE 
Change-Id: Icff770a9eb701279c5011e816970c69c58862174
Auto-generated-cl: translation import
 2015-03-02 06:15:22 -08:00
Geoff Mendal
6b5b052ee6 Import translations. DO NOT MERGE 
Change-Id: I7b517cbc545481e58ddc8afc769fc5f39d4fd1ad
Auto-generated-cl: translation import
 2015-03-02 06:09:28 -08:00
Geoff Mendal
4d065f9d62 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-03-02 13:52:07 +00:00
Geoff Mendal
20f4004368 Import translations. DO NOT MERGE 
Change-Id: I276c74627637383b8e9e132dcb41b597e7db1d54
Auto-generated-cl: translation import
 2015-03-02 05:48:19 -08:00
Geoff Mendal
c92894e61a Import translations. DO NOT MERGE 
Change-Id: I90f0e65ebcc2b70c492f9c1f726436f47c582a5d
Auto-generated-cl: translation import
 2015-03-02 05:42:09 -08:00
Jason Monk
58ae213c3d am 0ac63669: am 057fd382: am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev 
* commit '0ac63669b1a3da456fde5c8df61b652eb090a407':
  Keyguard: Use plmn/spn broadcast when no SIMs
 2015-02-26 23:31:35 +00:00
Jason Monk
0ac63669b1 am 057fd382: am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev 
* commit '057fd382cc26ff85db397835fdd3b7e5c73ef336':
  Keyguard: Use plmn/spn broadcast when no SIMs
 2015-02-26 23:18:53 +00:00
Jason Monk
057fd382cc am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev 
* commit '9df42df2bca0a7a91d813b19e084069675d4057b':
  Keyguard: Use plmn/spn broadcast when no SIMs
 2015-02-26 21:59:06 +00:00
Geoff Mendal
c2cbbb8906 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-02-25 14:09:55 +00:00
Geoff Mendal
ecac2cb4d2 Import translations. DO NOT MERGE 
Change-Id: I84339eebbf7a8e2332e85a104b85ec740a25d6f1
Auto-generated-cl: translation import
 2015-02-25 06:08:29 -08:00
Geoff Mendal
a4f544540e Import translations. DO NOT MERGE 
Change-Id: I5974f01d8313faa999068ffd844ecbafb9ab4321
Auto-generated-cl: translation import
 2015-02-25 06:02:34 -08:00
Geoff Mendal
ce64b99e44 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-25 13:44:55 +00:00
Geoff Mendal
5d7482adc1 Import translations. DO NOT MERGE 
Change-Id: Ib4c512a4856bdce8518bf1ee1a36ca5fc19a324b
Auto-generated-cl: translation import
 2015-02-25 05:41:09 -08:00
Geoff Mendal
53ddd69ea7 Import translations. DO NOT MERGE 
Change-Id: I14e100832a693f7e5cfa8d53edd90ebb1745c064
Auto-generated-cl: translation import
 2015-02-25 05:35:06 -08:00
Jason Monk
de3260b5bf Keyguard: Use plmn/spn broadcast when no SIMs 
The keyguard needs to show either 'emergency calls only' or 'no service'
depending on whether there is service available, so try to pull this from
the old sticky broadcast containing plmn/spn.

Bug: 19476978
Change-Id: I83523cc4c7dd5f46bd97df2cc9ecdb38d1c2e001
 2015-02-24 10:13:47 -05:00
Geoff Mendal
e74331dc0e Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-02-23 14:20:07 +00:00
Geoff Mendal
954759b363 Import translations. DO NOT MERGE 
Change-Id: I06d6d60e4d09ad158c554e6c8e3865f06895db56
Auto-generated-cl: translation import
 2015-02-23 06:18:26 -08:00
Geoff Mendal
dc82f4ce1c Import translations. DO NOT MERGE 
Change-Id: I470855ce547f2e302f9ad27a3c08ad40d8fd0048
Auto-generated-cl: translation import
 2015-02-23 06:12:16 -08:00
Geoff Mendal
1f4e01f2b3 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-23 13:52:02 +00:00
Geoff Mendal
52a260b4b4 Import translations. DO NOT MERGE 
Change-Id: I44a58cca048a4a35b5f815c4be9bd1ca1bfad1b7
Auto-generated-cl: translation import
 2015-02-23 05:50:48 -08:00
Geoff Mendal
7aaaacc1d1 Import translations. DO NOT MERGE 
Change-Id: I35b9d89969207b2ce627e5e7af517e6f8f519650
Auto-generated-cl: translation import
 2015-02-23 05:44:35 -08:00
Adrian Roos
309b71e530 am 823bf307: am b5e787c1: am 26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev 
* commit '823bf307a248f332f708fd8b359008df837722eb':
  Fix change IME content description
 2015-02-20 14:46:45 +00:00
Adrian Roos
823bf307a2 am b5e787c1: am 26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev 
* commit 'b5e787c1c5a1845e0b8de53f1452a7a6cdeb4c93':
  Fix change IME content description
 2015-02-20 14:39:30 +00:00
Adrian Roos
b5e787c1c5 am 26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev 
* commit '26b0d973d8c2b05e6141fb4808fbb0a28cb7f713':
  Fix change IME content description
 2015-02-20 14:32:44 +00:00
Adrian Roos
4a00263191 Fix change IME content description 
Bug: 19434845
Change-Id: I28be1d8efb61d47abdce168b07a0846056eb650d
 2015-02-19 18:21:52 +01:00
Jim Miller
9853ae6b88 am 3f711044: am 9c6c8df4: am 3dfd6389: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev 
* commit '3f711044a4a6cefa006a63052d785d3e1fb37576':
  Fix accessibility focus bug in statusbar
 2015-02-19 03:30:53 +00:00
Jim Miller
3f711044a4 am 9c6c8df4: am 3dfd6389: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev 
* commit '9c6c8df44c5c05badee895e95d8f2460f95e0ec0':
  Fix accessibility focus bug in statusbar
 2015-02-19 03:24:38 +00:00
Jim Miller
9c6c8df44c am 3dfd6389: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev 
* commit '3dfd638921b3038c6df0e515478eb8bafccbf058':
  Fix accessibility focus bug in statusbar
 2015-02-19 03:17:58 +00:00
Jim Miller
3dfd638921 Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev 2015-02-19 03:13:38 +00:00
Jim Miller
33a054d6fc Fix accessibility focus bug in statusbar 
The notification_stack_scroller view of the new uber statusbar should
not be focusable for accessibility

Fixes bug 19296202

Change-Id: I1b3f43ee3c480c705044cb3d565c7c7f7019bcc3
 2015-02-18 17:58:04 -08:00
Christopher Tate
32f216c359 am 8cd95aba: am 56238eaa: am 129ea76a: Fix wifi AP backup 
* commit '8cd95aba2f97eb552d437c185b156ba964886a6e':
  Fix wifi AP backup
 2015-02-18 02:23:06 +00:00
Christopher Tate
8cd95aba2f am 56238eaa: am 129ea76a: Fix wifi AP backup 
* commit '56238eaaa3688c9a9858058f4dc63aade7092d9b':
  Fix wifi AP backup
 2015-02-18 02:17:57 +00:00
Christopher Tate
56238eaaa3 am 129ea76a: Fix wifi AP backup 
* commit '129ea76a4a129fb3e8e997e8c604c0712e8a9d73':
  Fix wifi AP backup
 2015-02-18 02:07:55 +00:00
Christopher Tate
129ea76a4a Fix wifi AP backup 
An OutputStream buffers only by explicit contract.  OutputStreamWriter
buffers internally, always.  Do not get these behaviors confused.

Bug 19341967

Change-Id: I0610ed625b0175620083dd286f3a73c24956b171
 2015-02-17 17:07:37 -08:00